diff options
| author | Remi Collet <remi@remirepo.net> | 2024-07-01 08:22:21 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2024-07-01 08:22:21 +0200 |
| commit | daa4c27a0b47880983c48cc47fc84aacc9d9f0a9 (patch) | |
| tree | 3978b3f63d3173d20d8f7cc2d19cabb3f5b54713 /yaf-php74.patch | |
| parent | e9587cc8e70e43f1c52a8e3a3d5755096ff34c23 (diff) | |
cleanup
Diffstat (limited to 'yaf-php74.patch')
| -rw-r--r-- | yaf-php74.patch | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/yaf-php74.patch b/yaf-php74.patch deleted file mode 100644 index 863ed0a..0000000 --- a/yaf-php74.patch +++ /dev/null @@ -1,45 +0,0 @@ -From cd933d806d0016c8cadcc0c2f0996ebdc2e5d4b8 Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Mon, 19 Feb 2024 11:01:23 +0100 -Subject: [PATCH] Fix [-Wincompatible-pointer-types] with 7.4 - ---- - php_yaf.h | 4 ++++ - yaf.c | 4 ++++ - 2 files changed, 8 insertions(+) - -diff --git a/php_yaf.h b/php_yaf.h -index 9cd6e3a..6c1174e 100644 ---- a/php_yaf.h -+++ b/php_yaf.h -@@ -74,7 +74,11 @@ extern zend_module_entry yaf_module_entry; - #else - #define YAF_WRITE_HANDLER zval * - #define YAF_WHANDLER_RET(zv) return zv -+#if PHP_VERSION_ID >= 80000 - HashTable *yaf_fake_get_gc(zend_object *zobj, zval **table, int *n); -+#else -+HashTable *yaf_fake_get_gc(zval *zobj, zval **table, int *n); -+#endif - #endif - - #if PHP_VERSION_ID < 80000 -diff --git a/yaf.c b/yaf.c -index d59cdfe..e7e1b9d 100644 ---- a/yaf.c -+++ b/yaf.c -@@ -72,7 +72,11 @@ void yaf_iterator_dtor(zend_object_iterator *iter) /* {{{ */ { - /* }}} */ - - #if PHP_VERSION_ID >= 70400 -+#if PHP_VERSION_ID >= 80000 - HashTable *yaf_fake_get_gc(zend_object *zobj, zval **table, int *n) /* {{{ */ { -+#else -+HashTable *yaf_fake_get_gc(zval *zobj, zval **table, int *n) /* {{{ */ { -+#endif - *n = 0; - *table = NULL; - return NULL; --- -2.43.2 - |