1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
|
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
|
