From 410e37ad6582d4a083d7bfbaf1f5020f8bcb49bd Mon Sep 17 00:00:00 2001 From: Andy Postnikov Date: Tue, 14 Jul 2020 01:05:03 +0300 Subject: [PATCH 1/2] Fix 8.0 compatibility - replace call_user_function_ex() with call_user_function() --- memcache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/memcache.c b/memcache.c index 6a7576d..6587186 100644 --- a/memcache.c +++ b/memcache.c @@ -1093,7 +1093,7 @@ void mmc_server_deactivate(mmc_t *mmc TSRMLS_DC) /* disconnect and marks the se } ZVAL_LONG(errnum, mmc->errnum); - call_user_function_ex(EG(function_table), NULL, mmc->failure_callback, &retval, 5, params, 0, NULL TSRMLS_CC); + call_user_function(EG(function_table), NULL, mmc->failure_callback, &retval, 5, params); zval_ptr_dtor(&host); zval_ptr_dtor(&tcp_port); zval_ptr_dtor(&udp_port); From 4ab65aca60035dd105013e355c215fe204ed0041 Mon Sep 17 00:00:00 2001 From: Andy Postnikov Date: Tue, 14 Jul 2020 01:33:58 +0300 Subject: [PATCH 2/2] fix smartptr headers --- memcache.c | 2 +- php_memcache.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/memcache.c b/memcache.c index 6587186..1f35b78 100644 --- a/memcache.c +++ b/memcache.c @@ -37,7 +37,7 @@ #include "ext/standard/info.h" #include "ext/standard/php_string.h" #include "ext/standard/php_var.h" -#include "ext/standard/php_smart_str.h" +#include "Zend/zend_smart_str.h" #include "php_network.h" #include "php_memcache.h" #include "memcache_queue.h" diff --git a/php_memcache.h b/php_memcache.h index 7e6ac4e..3ac332e 100644 --- a/php_memcache.h +++ b/php_memcache.h @@ -35,7 +35,7 @@ extern zend_module_entry memcache_module_entry; #include "TSRM.h" #endif -#include "ext/standard/php_smart_str_public.h" +#include "Zend/zend_smart_str_public.h" PHP_MINIT_FUNCTION(memcache); PHP_MSHUTDOWN_FUNCTION(memcache);