[packages/php-pecl-memcache] - rel 8; drop problematic inline
arekm
arekm at pld-linux.org
Sat Sep 26 22:25:04 CEST 2015
commit 36ec692ab5902e9c2b8b0b497f55da5d701360a8
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Sat Sep 26 22:24:56 2015 +0200
- rel 8; drop problematic inline
memcache-faulty-inline.diff | 76 +++++++++++++++++++++++++++++++++++++++++++++
php-pecl-memcache.spec | 4 ++-
2 files changed, 79 insertions(+), 1 deletion(-)
---
diff --git a/php-pecl-memcache.spec b/php-pecl-memcache.spec
index cdd39b2..89c1b52 100644
--- a/php-pecl-memcache.spec
+++ b/php-pecl-memcache.spec
@@ -6,7 +6,7 @@ Summary: %{modname} - a memcached extension
Summary(pl.UTF-8): %{modname} - rozszerzenie memcached
Name: %{php_name}-pecl-%{modname}
Version: 3.0.8
-Release: 7
+Release: 8
License: PHP 3.01
Group: Development/Languages/PHP
Source0: http://pecl.php.net/get/%{modname}-%{version}.tgz
@@ -16,6 +16,7 @@ Source2: %{modname}-apache.conf
Source3: %{modname}-lighttpd.conf
Source4: config.php
Patch0: %{modname}-webapp.patch
+Patch1: memcache-faulty-inline.diff
URL: http://pecl.php.net/package/memcache/
BuildRequires: %{php_name}-devel >= 3:5.0.0
BuildRequires: %{php_name}-xml
@@ -78,6 +79,7 @@ memcache.
%setup -q -c
mv %{modname}-%{version}/* .
%patch0 -p1
+%patch1 -p1
%build
packagexml2cl package.xml > ChangeLog
diff --git a/memcache-faulty-inline.diff b/memcache-faulty-inline.diff
new file mode 100644
index 0000000..8e72510
--- /dev/null
+++ b/memcache-faulty-inline.diff
@@ -0,0 +1,76 @@
+diff -urN memcache-3.0.8.org/memcache_pool.c memcache-3.0.8/memcache_pool.c
+--- memcache-3.0.8.org/memcache_pool.c 2013-04-08 04:12:54.000000000 +0200
++++ memcache-3.0.8/memcache_pool.c 2015-09-26 22:22:07.977632801 +0200
+@@ -40,7 +40,7 @@
+
+ ZEND_DECLARE_MODULE_GLOBALS(memcache)
+
+-inline void mmc_buffer_alloc(mmc_buffer_t *buffer, unsigned int size) /*
++void mmc_buffer_alloc(mmc_buffer_t *buffer, unsigned int size) /*
+ ensures space for an additional size bytes {{{ */
+ {
+ register size_t newlen;
+@@ -48,7 +48,7 @@
+ }
+ /* }}} */
+
+-inline void mmc_buffer_free(mmc_buffer_t *buffer) /* {{{ */
++void mmc_buffer_free(mmc_buffer_t *buffer) /* {{{ */
+ {
+ if (buffer->value.c != NULL) {
+ smart_str_free(&(buffer->value));
+@@ -1676,7 +1676,7 @@
+ }
+ /* }}} */
+
+-inline int mmc_prepare_key_ex(const char *key, unsigned int key_len, char *result, unsigned int *result_len) /* {{{ */
++int mmc_prepare_key_ex(const char *key, unsigned int key_len, char *result, unsigned int *result_len) /* {{{ */
+ {
+ unsigned int i;
+ if (key_len == 0) {
+@@ -1694,7 +1694,7 @@
+ }
+ /* }}} */
+
+-inline int mmc_prepare_key(zval *key, char *result, unsigned int *result_len) /* {{{ */
++int mmc_prepare_key(zval *key, char *result, unsigned int *result_len) /* {{{ */
+ {
+ if (Z_TYPE_P(key) == IS_STRING) {
+ return mmc_prepare_key_ex(Z_STRVAL_P(key), Z_STRLEN_P(key), result, result_len);
+diff -urN memcache-3.0.8.org/memcache_pool.h memcache-3.0.8/memcache_pool.h
+--- memcache-3.0.8.org/memcache_pool.h 2013-04-08 04:12:54.000000000 +0200
++++ memcache-3.0.8/memcache_pool.h 2015-09-26 22:22:28.461473438 +0200
+@@ -135,8 +135,8 @@
+ #define mmc_buffer_release(b) memset((b), 0, sizeof(*(b)))
+ #define mmc_buffer_reset(b) (b)->value.len = (b)->idx = 0
+
+-inline void mmc_buffer_alloc(mmc_buffer_t *, unsigned int);
+-inline void mmc_buffer_free(mmc_buffer_t *);
++void mmc_buffer_alloc(mmc_buffer_t *, unsigned int);
++void mmc_buffer_free(mmc_buffer_t *);
+
+ /* stream handlers */
+ typedef struct mmc_stream mmc_stream_t;
+@@ -391,8 +391,8 @@
+ double timeval_to_double(struct timeval tv);
+ struct timeval double_to_timeval(double sec);
+
+-inline int mmc_prepare_key_ex(const char *, unsigned int, char *, unsigned int *);
+-inline int mmc_prepare_key(zval *, char *, unsigned int *);
++int mmc_prepare_key_ex(const char *, unsigned int, char *, unsigned int *);
++int mmc_prepare_key(zval *, char *, unsigned int *);
+
+ #define mmc_str_left(h, n, hlen, nlen) ((hlen) >= (nlen) ? memcmp((h), (n), (nlen)) == 0 : 0)
+
+diff -urN memcache-3.0.8.org/memcache_queue.h memcache-3.0.8/memcache_queue.h
+--- memcache-3.0.8.org/memcache_queue.h 2013-04-08 04:12:54.000000000 +0200
++++ memcache-3.0.8/memcache_queue.h 2015-09-26 22:22:54.378781973 +0200
+@@ -40,7 +40,7 @@
+ #ifdef PHP_WIN32
+ #define MMC_QUEUE_INLINE
+ #else
+-#define MMC_QUEUE_INLINE inline
++#define MMC_QUEUE_INLINE
+ #endif
+
+ MMC_QUEUE_INLINE void mmc_queue_push(mmc_queue_t *, void *);
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php-pecl-memcache.git/commitdiff/36ec692ab5902e9c2b8b0b497f55da5d701360a8
More information about the pld-cvs-commit
mailing list