[pecl-networking-gearman] master: Merge pull request #68 from remicollet/issue-php86a2

Author: Rasmus Lerdorf (rlerdorf) Committer: GitHub (web-flow) Pusher: rlerdorf Date: 2026-08-26T15:16:37-04:00 Commit: https://github.com/php/pecl-networking-gearman/commit/3804529ee5b7b2a7dad6e72d47fd36ded5d0f186 Raw diff: https://github.com/php/pecl-networking-gearman/commit/3804529ee5b7b2a7dad6e72d47fd36ded5d0f186.diff Merge pull request #68 from remicollet/issue-php86a2 Fix build with PHP 8.6.0alpha2 Changed paths: M php_gearman.c M php_gearman_client.c M php_gearman_job.c M php_gearman_task.c M php_gearman_worker.c Diff: diff --git a/php_gearman.c b/php_gearman.c index f62756d..c75f5e6 100644 --- a/php_gearman.c +++ b/php_gearman.c @@ -97,28 +97,28 @@ PHP_MINIT_FUNCTION(gearman) { gearman_client_ce = zend_register_internal_class(&ce); gearman_client_ce->create_object = gearman_client_obj_new; memcpy(&gearman_client_obj_handlers, zend_get_std_object_handlers(), sizeof(gearman_client_obj_handlers)); - gearman_client_obj_handlers.offset = XtOffsetOf(gearman_client_obj, std); + gearman_client_obj_handlers.offset = offsetof(gearman_client_obj, std); gearman_client_obj_handlers.free_obj = gearman_client_free_obj; INIT_CLASS_ENTRY(ce, "GearmanTask", class_GearmanTask_methods); gearman_task_ce = zend_register_internal_class(&ce); gearman_task_ce->create_object = gearman_task_obj_new; memcpy(&gearman_task_obj_handlers, zend_get_std_object_handlers(), sizeof(gearman_task_obj_handlers)); - gearman_task_obj_handlers.offset = XtOffsetOf(gearman_task_obj, std); + gearman_task_obj_handlers.offset = offsetof(gearman_task_obj, std); gearman_task_obj_handlers.free_obj = gearman_task_free_obj; INIT_CLASS_ENTRY(ce, "GearmanWorker", class_GearmanWorker_methods); gearman_worker_ce = zend_register_internal_class(&ce); gearman_worker_ce->create_object = gearman_worker_obj_new; memcpy(&gearman_worker_obj_handlers, zend_get_std_object_handlers(), sizeof(gearman_worker_obj_handlers)); - gearman_worker_obj_handlers.offset = XtOffsetOf(gearman_worker_obj, std); + gearman_worker_obj_handlers.offset = offsetof(gearman_worker_obj, std); gearman_worker_obj_handlers.free_obj = gearman_worker_free_obj; INIT_CLASS_ENTRY(ce, "GearmanJob", class_GearmanJob_methods); gearman_job_ce = zend_register_internal_class(&ce); gearman_job_ce->create_object = gearman_job_obj_new; memcpy(&gearman_job_obj_handlers, zend_get_std_object_handlers(), sizeof(gearman_job_obj_handlers)); - gearman_job_obj_handlers.offset = XtOffsetOf(gearman_job_obj, std); + gearman_job_obj_handlers.offset = offsetof(gearman_job_obj, std); /* XXX exception class */ INIT_CLASS_ENTRY(ce, "GearmanException", NULL) diff --git a/php_gearman_client.c b/php_gearman_client.c index fb95bbf..abd621f 100644 --- a/php_gearman_client.c +++ b/php_gearman_client.c @@ -17,7 +17,7 @@ #include "php_gearman_client.h" inline gearman_client_obj *gearman_client_fetch_object(zend_object *obj) { - return (gearman_client_obj *)((char*)(obj) - XtOffsetOf(gearman_client_obj, std)); + return (gearman_client_obj *)((char*)(obj) - offsetof(gearman_client_obj, std)); } static void gearman_client_ctor(INTERNAL_FUNCTION_PARAMETERS) { diff --git a/php_gearman_job.c b/php_gearman_job.c index 97036c9..3eca780 100644 --- a/php_gearman_job.c +++ b/php_gearman_job.c @@ -12,7 +12,7 @@ #include "php_gearman_job.h" inline gearman_job_obj *gearman_job_fetch_object(zend_object *obj) { - return (gearman_job_obj *)((char*)(obj) - XtOffsetOf(gearman_job_obj, std)); + return (gearman_job_obj *)((char*)(obj) - offsetof(gearman_job_obj, std)); } /* {{{ proto object GearmanJob::__destruct() diff --git a/php_gearman_task.c b/php_gearman_task.c index 1083eec..5020c95 100644 --- a/php_gearman_task.c +++ b/php_gearman_task.c @@ -12,7 +12,7 @@ #include "php_gearman_task.h" inline gearman_task_obj *gearman_task_fetch_object(zend_object *obj) { - return (gearman_task_obj *)((char*)(obj) - XtOffsetOf(gearman_task_obj, std)); + return (gearman_task_obj *)((char*)(obj) - offsetof(gearman_task_obj, std)); } inline zend_object *gearman_task_obj_new(zend_class_entry *ce) { diff --git a/php_gearman_worker.c b/php_gearman_worker.c index bc9fbd1..8876b0a 100644 --- a/php_gearman_worker.c +++ b/php_gearman_worker.c @@ -16,7 +16,7 @@ #include "php_gearman_worker.h" gearman_worker_obj *gearman_worker_fetch_object(zend_object *obj) { - return (gearman_worker_obj *)((char*)(obj) - XtOffsetOf(gearman_worker_obj, std)); + return (gearman_worker_obj *)((char*)(obj) - offsetof(gearman_worker_obj, std)); } /* {{{ proto object gearman_worker_ctor()