diff options
| author | Remi Collet <remi@remirepo.net> | 2024-09-30 09:05:03 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2024-09-30 09:05:03 +0200 |
| commit | 58a9c96b46b5622614150bec697ee0ceef3dfe5f (patch) | |
| tree | 314daec50018e0867ecbc684e21396527cd94f6f /2.patch | |
| parent | afb38cb0ea3bbf55398e1336339b33cfd19049a8 (diff) | |
https://github.com/php/pecl-xml-xmldiff/pull/2
Diffstat (limited to '2.patch')
| -rw-r--r-- | 2.patch | 24 |
1 files changed, 24 insertions, 0 deletions
@@ -0,0 +1,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 |