[pecl-xml-xmldiff] master: Fix for PHP 8.6.0beta2 (#9)
| From: | Remi Collet via GitHub | Date: | Thu, 03 Sep 2026 10:39:56 +0000 |
| Subject: | [pecl-xml-xmldiff] master: Fix for PHP 8.6.0beta2 (#9) | ||
| Groups: | php.pecl.cvs | ||
| Request: | Send a blank email to pecl-cvs+get-28670@lists.php.net to get a copy of this message | ||
Author: Remi Collet (remicollet)
Committer: GitHub (web-flow)
Pusher: ndossche
Date: 2026-09-03T12:39:54+02:00
Commit: https://github.com/php/pecl-xml-xmldiff/commit/583db81c494e38f924e9c2ae576475df8d162da3
Raw diff: https://github.com/php/pecl-xml-xmldiff/commit/583db81c494e38f924e9c2ae576475df8d162da3.diff
Fix for PHP 8.6.0beta2 (#9)
. The XtOffsetOf() alias of C’s offsetof() macro has been removed. Use
offsetof() directly.
Changed paths:
M php_xmldiff.h
M xmldiff.cpp
Diff:
diff --git a/php_xmldiff.h b/php_xmldiff.h
index 3064305..02df682 100644
--- a/php_xmldiff.h
+++ b/php_xmldiff.h
@@ -101,7 +101,7 @@ struct ze_xmldiff_obj {
static zend_always_inline struct ze_xmldiff_obj *
php_xmldiff_fetch_obj(zend_object *obj)
{/*{{{*/
- return (struct ze_xmldiff_obj *)((char *)obj - XtOffsetOf(struct ze_xmldiff_obj, zo));
+ return (struct ze_xmldiff_obj *)((char *)obj - offsetof(struct ze_xmldiff_obj, zo));
}/*}}}*/
#else
struct ze_xmldiff_obj {
diff --git a/xmldiff.cpp b/xmldiff.cpp
index 8e13c9e..299c6d1 100644
--- a/xmldiff.cpp
+++ b/xmldiff.cpp
@@ -243,7 +243,7 @@ PHP_MINIT_FUNCTION(xmldiff)
memcpy(&default_xmldiff_handlers, zend_get_std_object_handlers(),
sizeof(zend_object_handlers));
default_xmldiff_handlers.clone_obj = NULL;
#if PHP_MAJOR_VERSION >= 7
- default_xmldiff_handlers.offset = XtOffsetOf(struct ze_xmldiff_obj, zo);
+ default_xmldiff_handlers.offset = offsetof(struct ze_xmldiff_obj, zo);
default_xmldiff_handlers.free_obj = php_xmldiff_obj_destroy;
#endif