diff options
Diffstat (limited to 'd3433a1875581d66530874c44345fc74e8eebc64.patch')
| -rw-r--r-- | d3433a1875581d66530874c44345fc74e8eebc64.patch | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/d3433a1875581d66530874c44345fc74e8eebc64.patch b/d3433a1875581d66530874c44345fc74e8eebc64.patch deleted file mode 100644 index bf7580a..0000000 --- a/d3433a1875581d66530874c44345fc74e8eebc64.patch +++ /dev/null @@ -1,37 +0,0 @@ -From d3433a1875581d66530874c44345fc74e8eebc64 Mon Sep 17 00:00:00 2001 -From: Bob Weinand <bobwei9@hotmail.com> -Date: Sun, 8 Jul 2018 09:07:31 +0200 -Subject: [PATCH] Fix ZTS build - ---- - php_uv.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/php_uv.c b/php_uv.c -index b150fc4..18a4b14 100644 ---- a/php_uv.c -+++ b/php_uv.c -@@ -1364,7 +1364,11 @@ static int php_uv_do_callback3(zval *retval_ptr, php_uv_t *uv, zval *params, int - uv->callback[type]->fci.param_count = param_count; - uv->callback[type]->fci.no_separation = 1; - uv->callback[type]->fci.object = NULL; -+#if PHP_VERSION_ID >= 70300 -+ uv->callback[type]->fci.size = sizeof(zend_fcall_info); -+#else - uv->callback[type]->fcc.initialized = 1; -+#endif - - uv->callback[type]->fcc.calling_scope = NULL; - uv->callback[type]->fcc.called_scope = NULL; -@@ -2566,7 +2570,11 @@ PHP_MINIT_FUNCTION(uv) - { - PHP_UV_PROBE(MINIT); - -+#ifdef PHP_VERSION_ID >= 70300 -+ memcpy(&uv_default_handlers, &std_object_handlers, sizeof(zend_object_handlers)); -+#else - memcpy(&uv_default_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); -+#endif - uv_default_handlers.clone_obj = NULL; - uv_default_handlers.get_constructor = php_uv_get_ctor; - uv_default_handlers.cast_object = php_uv_cast_object; |