From b8aec911441a7acb7d2d0863f2893f0ea978d285 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 16 Jul 2026 09:47:59 +0200 Subject: [PATCH] Fix build with PHP 8.6.0alpha2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit . The zval_dtor() alias of zval_ptr_dtor_nogc() has been removed. Call zval_ptr_dtor_nogc() directly instead. . The XtOffsetOf() alias of C’s offsetof() macro has been removed. Use offsetof() directly. --- php8/classes/buffer.c | 2 +- php8/src/util.c | 8 ++++---- php8/src/util.h | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/php8/classes/buffer.c b/php8/classes/buffer.c index 73f74db..4e3551c 100644 --- a/php8/classes/buffer.c +++ b/php8/classes/buffer.c @@ -399,7 +399,7 @@ PHP_EVENT_METHOD(EventBuffer, copyout) if (ret > 0) { convert_to_string(zdata); - zval_dtor(zdata); + zval_ptr_dtor_nogc(zdata); ZVAL_STRINGL(zdata, data, ret); } diff --git a/php8/src/util.c b/php8/src/util.c index f4727b5..bc32e63 100644 --- a/php8/src/util.c +++ b/php8/src/util.c @@ -132,7 +132,7 @@ int _php_event_getsockname(evutil_socket_t fd, zval *pzaddr, zval *pzport)/*{{{* if (evutil_inet_ntop(sa->sa_family, &sin->sin_addr, (void *) &addr, sizeof(addr))) { if (!Z_ISUNDEF_P(pzaddr)) { - zval_dtor(pzaddr); + zval_ptr_dtor_nogc(pzaddr); } ZVAL_STRING(pzaddr, addr); @@ -151,7 +151,7 @@ int _php_event_getsockname(evutil_socket_t fd, zval *pzaddr, zval *pzport)/*{{{* if (evutil_inet_ntop(sa->sa_family, &sin6->sin6_addr, (void *) &addr6, sizeof(addr6))) { if (!Z_ISUNDEF_P(pzaddr)) { - zval_dtor(pzaddr); + zval_ptr_dtor_nogc(pzaddr); } ZVAL_STRING(pzaddr, addr6); @@ -168,7 +168,7 @@ int _php_event_getsockname(evutil_socket_t fd, zval *pzaddr, zval *pzport)/*{{{* struct sockaddr_un *ua = (struct sockaddr_un *) sa; if (!Z_ISUNDEF_P(pzaddr)) { - zval_dtor(pzaddr); + zval_ptr_dtor_nogc(pzaddr); } ZVAL_STRING(pzaddr, ua->sun_path); } @@ -182,7 +182,7 @@ int _php_event_getsockname(evutil_socket_t fd, zval *pzaddr, zval *pzport)/*{{{* if (port != -1) { if (pzport && !Z_ISUNDEF_P(pzport)) { - zval_dtor(pzport); + zval_ptr_dtor_nogc(pzport); } ZVAL_LONG(pzport, port); } diff --git a/php8/src/util.h b/php8/src/util.h index 4b0ed18..26be773 100644 --- a/php8/src/util.h +++ b/php8/src/util.h @@ -119,7 +119,7 @@ static zend_always_inline void php_event_replace_zval(zval *zdst, zval *zsrc) {/ PHP_EVENT_X_OBJ_HANDLERS(x).name = php_event_ ## x ## _ ## name #define PHP_EVENT_SET_X_OBJ_HANDLERS(x) do { \ - PHP_EVENT_X_OBJ_HANDLERS(x).offset = XtOffsetOf(Z_EVENT_X_OBJ_T(x), zo); \ + PHP_EVENT_X_OBJ_HANDLERS(x).offset = offsetof(Z_EVENT_X_OBJ_T(x), zo); \ PHP_EVENT_X_OBJ_HANDLERS(x).get_gc = get_gc; \ PHP_EVENT_X_OBJ_HANDLERS(x).clone_obj = NULL; \ PHP_EVENT_SET_X_OBJ_HANDLER(x, free_obj); \ @@ -136,7 +136,7 @@ static zend_always_inline void php_event_replace_zval(zval *zdst, zval *zsrc) {/ #define Z_EVENT_X_FETCH_OBJ(x, pzo) php_event_ ## x ## _fetch_object(pzo) #define Z_EVENT_X_FETCH_OBJ_DECL(x) \ static zend_always_inline Z_EVENT_X_OBJ_T(x) * Z_EVENT_X_FETCH_OBJ(x, zend_object *obj) { \ - return (EXPECTED(obj) ? (Z_EVENT_X_OBJ_T(x) *)((char *)obj - XtOffsetOf(Z_EVENT_X_OBJ_T(x), zo)) : NULL); \ + return (EXPECTED(obj) ? (Z_EVENT_X_OBJ_T(x) *)((char *)obj - offsetof(Z_EVENT_X_OBJ_T(x), zo)) : NULL); \ } #define Z_EVENT_X_OBJ_P(x, zv) (EXPECTED(zv) ? Z_EVENT_X_FETCH_OBJ(x, Z_OBJ_P(zv)) : NULL) -- 2.55.0