mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-30 10:38:37 +00:00
Code Issues Releases Activity

Fix build with PHP 7.3

Browse Source
This commit is contained in:
Sunpoet Po-Chuan Hsieh 2018-10-14 16:28:19 +00:00
parent 5cd92a00a2
commit a59643c1a2
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=482056
2 changed files with 41 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
databases/php-memcache/Makefile
View File

@ -16,11 +16,12 @@ OPTIONS_DEFINE= EXAMPLES
PORTSCOUT= skipv:start
USES= dos2unix php:ext
USE_PHP= session:build zlib:build
CONFIGURE_ARGS= --with-zlib-dir=/usr
IGNORE_WITH_PHP=56
USE_CSTD= gnu89
USE_PHP= session:build zlib:build
USES= dos2unix php:ext
GH_ACCOUNT= websupport-sk
GH_PROJECT= pecl-${PORTNAME}

38
databases/php-memcache/files/patch-php7-memcache.c Normal file
View File

@ -0,0 +1,38 @@
--- php7/memcache.c.orig 2017-08-02 09:38:18 UTC
+++ php7/memcache.c
@@ -728,7 +728,11 @@ mmc_t *mmc_find_persistent(const char *h
mmc = mmc_server_new(host, host_len, port, udp_port, 1, timeout, retry_interval);
le->type = le_memcache_server;
le->ptr = mmc;
+#if PHP_VERSION_ID >= 70300
+ GC_SET_REFCOUNT(le, 1);
+#else
GC_REFCOUNT(le) = 1;
+#endif
/* register new persistent connection */
if (zend_hash_str_update_mem(&EG(persistent_list), key, key_len, le, sizeof(*le)) == NULL) {
@@ -786,7 +790,11 @@ static mmc_t *php_mmc_pool_addserver(
pool->failure_callback = &php_mmc_failure_callback;
list_res = zend_register_resource(pool, le_memcache_pool);
add_property_resource(mmc_object, "connection", list_res);
+#if PHP_VERSION_ID >= 70300
+ GC_ADDREF(list_res);
+#else
GC_REFCOUNT(list_res)++;
+#endif
}
else {
pool = zend_fetch_resource_ex(connection, "connection", le_memcache_pool);
@@ -870,7 +878,11 @@ static void php_mmc_connect(INTERNAL_FUN
mmc_object = return_value;
object_init_ex(mmc_object, memcache_ce);
add_property_resource(mmc_object, "connection", list_res);
+#if PHP_VERSION_ID >= 70300
+ GC_ADDREF(list_res);
+#else
GC_REFCOUNT(list_res)++;
+#endif
} else {
RETVAL_TRUE;
}