Skip to content

Fix GH-25023: ZEND_CONTAINER_OF() fails to compile with -std=c11 #25027

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
arnaud-lb merged 3 commits into from
Oct 29, 2026
Merged

Fix GH-25023: ZEND_CONTAINER_OF() fails to compile with -std=c11 #25027

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
04dda23
Fix GH-25023: ZEND_CONTAINER_OF() fails to compile with -std=c11
lazerg Oct 29, 2026
804a230
Add ZEND_TYPEOF() and use it in ZEND_CONTAINER_OF()
lazerg Oct 29, 2026
62164fb
[ci skip] NEWS
arnaud-lb Oct 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ PHP NEWS
for grouping. (Klaas Skelte van der Werf)
. Fixed unmapping of an unrelated range when the aligned chunk mmap fails
(Marti2203).
. Fixed bug GH-25023 (ZEND_CONTAINER_OF() fails to compile with -std=c11).
(lazerg)

- CLI:
. Fixed bug GH-24697 (PHP_HTTP_PARSER_STRICT build option doesn't work).
Expand Down
13 changes: 9 additions & 4 deletions Zend/zend_portability.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,6 +387,12 @@ char *alloca();
#define ZEND_ELEMENT_COUNT(m)
#endif

#if __STDC_VERSION__ >= 202311L
# define ZEND_TYPEOF(x) typeof(x)
#elif ZEND_GCC_VERSION
# define ZEND_TYPEOF(x) __typeof__(x)
#endif

#if __cplusplus
extern "C++" {
# include <cstddef>
Expand All @@ -401,13 +407,12 @@ extern "C++" {

# define ZEND_CONTAINER_OF(ptr, Type, member) zend_container_of<Type, decltype(Type::member)>(ptr, offsetof(Type, member))
}
#elif __STDC_VERSION__ >= 202311L || ZEND_GCC_VERSION
/* typeof is C23 or a GCC extension */
#elif defined(ZEND_TYPEOF)
# define ZEND_CONTAINER_OF(ptr, Type, member) \
_Generic( \
(ptr), \
const typeof(((Type*)0)->member) *: ((const Type*)((char*)(ptr) - offsetof(Type, member))), \
typeof(((Type*)0)->member) *: ((Type*)((char*)(ptr) - offsetof(Type, member))) \
const ZEND_TYPEOF(((Type*)0)->member) *: ((const Type*)((char*)(ptr) - offsetof(Type, member))), \
ZEND_TYPEOF(((Type*)0)->member) *: ((Type*)((char*)(ptr) - offsetof(Type, member))) \
)
#else
/* Define a variant that does not keep const-ness for older compilers. Mismatches
Expand Down
Loading