fix build with master

Author: m6w6

msgpack.c

@@ -280,7 +280,7 @@ PHP_MSGPACK_API int php_msgpack_unserialize(zval *return_value, char *str, size_
         default:
             MSGPACK_WARNING("[msgpack] (%s) Unknown result", __FUNCTION__);
     }
-    zval_dtor(return_value);
+    zval_ptr_dtor_nogc(return_value);
     msgpack_unserialize_var_destroy(&mp.user.var_hash, 1);
     RETVAL_FALSE;
     return FAILURE;

msgpack_class.c

@@ -27,12 +27,12 @@ typedef struct {
 } php_msgpack_unpacker_t;
 
 static inline php_msgpack_base_t *msgpack_base_fetch_object(zend_object *obj) {
-    return (php_msgpack_base_t *)((char*)(obj) - XtOffsetOf(php_msgpack_base_t, object));
+    return (php_msgpack_base_t *)((char*)(obj) - offsetof(php_msgpack_base_t, object));
 }
 #define Z_MSGPACK_BASE_P(zv) msgpack_base_fetch_object(Z_OBJ_P((zv)))
 
 static inline php_msgpack_unpacker_t *msgpack_unpacker_fetch_object(zend_object *obj) {
-    return (php_msgpack_unpacker_t *)((char*)(obj) - XtOffsetOf(php_msgpack_unpacker_t, object));
+    return (php_msgpack_unpacker_t *)((char*)(obj) - offsetof(php_msgpack_unpacker_t, object));
 }
 #define Z_MSGPACK_UNPACKER_P(zv) msgpack_unpacker_fetch_object(Z_OBJ_P((zv)))
 
@@ -516,7 +516,7 @@ void msgpack_init_class() /* {{{ */ {
     msgpack_ce = zend_register_internal_class(&ce);
     msgpack_ce->create_object = php_msgpack_base_new;
     memcpy(&msgpack_handlers, zend_get_std_object_handlers(),sizeof msgpack_handlers);
-    msgpack_handlers.offset = XtOffsetOf(php_msgpack_base_t, object);
+    msgpack_handlers.offset = offsetof(php_msgpack_base_t, object);
     msgpack_handlers.free_obj = php_msgpack_base_free;
 
     zend_declare_class_constant_long(msgpack_ce, ZEND_STRS("OPT_PHPONLY") - 1, MSGPACK_CLASS_OPT_PHPONLY);
@@ -528,7 +528,7 @@ void msgpack_init_class() /* {{{ */ {
     msgpack_unpacker_ce = zend_register_internal_class(&ce);
     msgpack_unpacker_ce->create_object = php_msgpack_unpacker_new;
     memcpy(&msgpack_unpacker_handlers, zend_get_std_object_handlers(),sizeof msgpack_unpacker_handlers);
-    msgpack_unpacker_handlers.offset = XtOffsetOf(php_msgpack_unpacker_t, object);
+    msgpack_unpacker_handlers.offset = offsetof(php_msgpack_unpacker_t, object);
     msgpack_unpacker_handlers.free_obj = php_msgpack_unpacker_free;
     msgpack_unpacker_handlers.clone_obj = NULL;
 

msgpack_unpack.c

@@ -329,7 +329,7 @@ static zend_class_entry* msgpack_unserialize_class(zval **container, zend_string
                 }
             }
             ZEND_HASH_FOREACH_END();
-            zval_dtor(&container_tmp);
+            zval_ptr_dtor_nogc(&container_tmp);
         }
 
     }