@@ -195,7 +195,7 @@ typedef struct {
195195} php_memc_result_callback_ctx_t ;
196196
197197static inline php_memc_object_t * php_memc_fetch_object (zend_object * obj ) {
198- return (php_memc_object_t * )((char * )obj - XtOffsetOf (php_memc_object_t , zo ));
198+ return (php_memc_object_t * )((char * )obj - offsetof (php_memc_object_t , zo ));
199199}
200200#define Z_MEMC_OBJ_P (zv ) php_memc_fetch_object(Z_OBJ_P(zv));
201201
@@ -280,7 +280,7 @@ typedef struct {
280280} php_memc_server_t ;
281281
282282static inline php_memc_server_t * php_memc_server_fetch_object (zend_object * obj ) {
283- return (php_memc_server_t * )((char * )obj - XtOffsetOf (php_memc_server_t , zo ));
283+ return (php_memc_server_t * )((char * )obj - offsetof (php_memc_server_t , zo ));
284284}
285285#define Z_MEMC_SERVER_P (zv ) php_memc_server_fetch_object(Z_OBJ_P(zv))
286286
@@ -4404,7 +4404,7 @@ PHP_MINIT_FUNCTION(memcached)
44044404 zend_class_entry ce ;
44054405
44064406 memcpy (& memcached_object_handlers , zend_get_std_object_handlers (), sizeof (zend_object_handlers ));
4407- memcached_object_handlers .offset = XtOffsetOf (php_memc_object_t , zo );
4407+ memcached_object_handlers .offset = offsetof (php_memc_object_t , zo );
44084408 memcached_object_handlers .clone_obj = NULL ;
44094409 memcached_object_handlers .free_obj = php_memc_object_free_storage ;
44104410
@@ -4415,7 +4415,7 @@ PHP_MINIT_FUNCTION(memcached)
44154415
44164416#ifdef HAVE_MEMCACHED_PROTOCOL
44174417 memcpy (& memcached_server_object_handlers , zend_get_std_object_handlers (), sizeof (zend_object_handlers ));
4418- memcached_server_object_handlers .offset = XtOffsetOf (php_memc_server_t , zo );
4418+ memcached_server_object_handlers .offset = offsetof (php_memc_server_t , zo );
44194419 memcached_server_object_handlers .clone_obj = NULL ;
44204420 memcached_server_object_handlers .free_obj = php_memc_server_free_storage ;
44214421
0 commit comments