summaryrefslogtreecommitdiffstats
path: root/2.patch
blob: 546b93674998fd94ef1912ad0ac31cd1f41eddf3 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
From 6113283a3c2c44075eada797e5c294e185e09943 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 30 Sep 2024 08:53:27 +0200
Subject: [PATCH] Fix DOM_RET_OBJ calls for 8.4

---
 php_xmldiff.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/php_xmldiff.h b/php_xmldiff.h
index 9ab2d08..c9be5c7 100644
--- a/php_xmldiff.h
+++ b/php_xmldiff.h
@@ -190,7 +190,9 @@ php_xmldiff_do_diff_memory(const char *from, size_t from_len, const char *to, si
 PHP_XMLDIFF_API xmlChar *
 php_xmldiff_do_merge_memory(const char *src, size_t src_len, const char *diff, size_t diff_len, struct ze_xmldiff_obj *zxo TSRMLS_DC);
 
-#if PHP_MAJOR_VERSION >= 7 || PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION > 3
+#if PHP_MAJOR_VERSION > 8 || PHP_MAJOR_VERSION == 8 && PHP_MINOR_VERSION > 3
+#  define XMLDIFF_DOM_RET_OBJ(obj, ret, domobject) DOM_RET_OBJ(obj, domobject)
+#elif PHP_MAJOR_VERSION >= 7 || PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION > 3
 #  define XMLDIFF_DOM_RET_OBJ DOM_RET_OBJ
 #elif PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION == 3 && PHP_RELEASE_VERSION > 6
 #  define XMLDIFF_DOM_RET_OBJ DOM_RET_OBJ_EX