summaryrefslogtreecommitdiffstats
path: root/30.patch
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-01-21 09:05:30 +0100
committerRemi Collet <remi@remirepo.net>2019-01-21 09:05:30 +0100
commit18df250a7b8c862d203f4a154836d11c19016531 (patch)
treecca79e87dcdd97b6dc3e384b913846e2a9e2ce53 /30.patch
parent9a3f5d393b40029b494068c5cd49922292560404 (diff)
refresh patch (for php < 7.2)
Diffstat (limited to '30.patch')
-rw-r--r--30.patch26
1 files changed, 25 insertions, 1 deletions
diff --git a/30.patch b/30.patch
index 3d98af2..75a59ca 100644
--- a/30.patch
+++ b/30.patch
@@ -1,7 +1,7 @@
From 82f7fa12daef81f4a9b3c923c848a53dcc1b3b23 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 22 Jun 2018 13:57:47 +0200
-Subject: [PATCH] fix for PHP 7.3 + fix build warnings
+Subject: [PATCH 1/2] fix for PHP 7.3 + fix build warnings
---
php7/memcache.c | 14 +++++++++++++-
@@ -185,3 +185,27 @@ index dd2434a..98cfde1 100644
mmc_pool_add(pool, mmc, weight);
php_url_free(url);
}
+
+From 09e21a63410cbfd8827c7a876d8160a6b80b076c Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Fri, 22 Jun 2018 15:11:07 +0200
+Subject: [PATCH 2/2] readd this for php < 7.2
+
+---
+ php7/memcache_pool.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/php7/memcache_pool.c b/php7/memcache_pool.c
+index f6e016b..86e8983 100644
+--- a/php7/memcache_pool.c
++++ b/php7/memcache_pool.c
+@@ -44,6 +44,9 @@ ZEND_DECLARE_MODULE_GLOBALS(memcache)
+ MMC_POOL_INLINE void mmc_buffer_alloc(mmc_buffer_t *buffer, unsigned int size) /*
+ ensures space for an additional size bytes {{{ */
+ {
++#if PHP_VERSION_ID < 70200
++ register size_t newlen;
++#endif
+ smart_string_alloc((&(buffer->value)), size, 0);
+ }
+ /* }}} */