Fix PHP 8.6 compatibility

src/php/handlers/php_heap_handlers.c

@@ -51,7 +51,7 @@ void php_ds_register_heap_handlers()
 {
     memcpy(&php_heap_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
 
-    php_heap_handlers.offset          = XtOffsetOf(php_ds_heap_t, std);
+    php_heap_handlers.offset          = offsetof(php_ds_heap_t, std);
     php_heap_handlers.dtor_obj        = zend_objects_destroy_object;
     php_heap_handlers.free_obj        = php_ds_heap_free_object;
     php_heap_handlers.get_gc          = php_ds_heap_get_gc;

src/php/handlers/php_map_handlers.c

@@ -109,7 +109,7 @@ void php_ds_register_map_handlers()
 {
     memcpy(&php_map_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
 
-    php_map_handlers.offset             = XtOffsetOf(php_ds_map_t, std);
+    php_map_handlers.offset             = offsetof(php_ds_map_t, std);
     php_map_handlers.dtor_obj           = zend_objects_destroy_object;
     php_map_handlers.get_gc             = php_ds_map_get_gc;
     php_map_handlers.free_obj           = php_ds_map_free_object;

src/php/handlers/php_pair_handlers.c

@@ -26,7 +26,7 @@ void php_ds_register_pair_handlers()
 {
     memcpy(&php_pair_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
 
-    php_pair_handlers.offset = XtOffsetOf(php_ds_pair_t, std);
+    php_pair_handlers.offset = offsetof(php_ds_pair_t, std);
 
     php_pair_handlers.clone_obj               = php_ds_pair_clone_object;
     php_pair_handlers.cast_object             = php_ds_default_cast_object;

src/php/handlers/php_seq_handlers.c

@@ -132,7 +132,7 @@ void php_ds_register_seq_handlers()
 {
     memcpy(&php_seq_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
 
-    php_seq_handlers.offset = XtOffsetOf(php_ds_seq_t, std);
+    php_seq_handlers.offset = offsetof(php_ds_seq_t, std);
 
     php_seq_handlers.dtor_obj         = zend_objects_destroy_object;
     php_seq_handlers.free_obj         = php_ds_seq_free_object;

src/php/handlers/php_set_handlers.c

@@ -81,7 +81,7 @@ void php_ds_register_set_handlers()
 {
     memcpy(&php_ds_set_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
 
-    php_ds_set_handlers.offset = XtOffsetOf(php_ds_set_t, std);
+    php_ds_set_handlers.offset = offsetof(php_ds_set_t, std);
 
     php_ds_set_handlers.cast_object     = php_ds_default_cast_object;
     php_ds_set_handlers.clone_obj       = php_ds_set_clone_obj;

src/php/objects/php_heap.h

@@ -12,7 +12,7 @@ typedef struct _php_ds_heap_t {
 } php_ds_heap_t;
 
 static inline php_ds_heap_t *php_ds_heap_fetch_object(zend_object *obj) {
-    return (php_ds_heap_t *)((char*)(obj) - XtOffsetOf(php_ds_heap_t, std));
+    return (php_ds_heap_t *)((char*)(obj) - offsetof(php_ds_heap_t, std));
 }
 
 #define Z_DS_HEAP(z)    (php_ds_heap_fetch_object(Z_OBJ(z)))

src/php/objects/php_map.h

@@ -9,7 +9,7 @@ typedef struct _php_ds_map_t {
 } php_ds_map_t;
 
 static inline php_ds_map_t *php_ds_map_fetch_object(zend_object *obj) {
-	return (php_ds_map_t *)((char*)(obj) - XtOffsetOf(php_ds_map_t, std));
+	return (php_ds_map_t *)((char*)(obj) - offsetof(php_ds_map_t, std));
 }
 
 #define Z_DS_MAP(z)   (php_ds_map_fetch_object(Z_OBJ(z))->map)

src/php/objects/php_seq.h

@@ -9,7 +9,7 @@ typedef struct php_ds_seq {
 } php_ds_seq_t;
 
 static inline php_ds_seq_t *php_ds_seq_fetch_object(zend_object *obj) {
-	return (php_ds_seq_t *)((char*)(obj) - XtOffsetOf(php_ds_seq_t, std));
+	return (php_ds_seq_t *)((char*)(obj) - offsetof(php_ds_seq_t, std));
 }
 
 #define Z_DS_SEQ(z)   (php_ds_seq_fetch_object(Z_OBJ(z))->seq)

src/php/objects/php_set.h

@@ -9,7 +9,7 @@ typedef struct _php_ds_set_t {
 } php_ds_set_t;
 
 static inline php_ds_set_t *php_ds_set_fetch_object(zend_object *obj) {
-	return (php_ds_set_t *)((char*)(obj) - XtOffsetOf(php_ds_set_t, std));
+	return (php_ds_set_t *)((char*)(obj) - offsetof(php_ds_set_t, std));
 }
 
 #define Z_DS_SET(z)   (php_ds_set_fetch_object(Z_OBJ(z))->set)