[php-src] master: Merge branch 'PHP-8.4' into PHP-8.5
Levi Morrison <[email protected]>
| Newsgroups | gmane.comp.php.cvs.general |
|---|---|
| Message-ID | <[email protected]> |
Author: Levi Morrison (morrisonlevi)
Date: 2026-08-19T09:57:56-06:00
Commit: https://github.com/php/php-src/commit/4e122779de240019b0a9dd4c47002504af7d7dda
Raw diff: https://github.com/php/php-src/commit/4e122779de240019b0a9dd4c47002504af7d7dda.diff
Merge branch 'PHP-8.4' into PHP-8.5
Changed paths:
M ext/opcache/zend_shared_alloc.c
Diff:
diff --git a/ext/opcache/zend_shared_alloc.c b/ext/opcache/zend_shared_alloc.c
index aaf659dc4f34..986fa52a146f 100644
--- a/ext/opcache/zend_shared_alloc.c
+++ b/ext/opcache/zend_shared_alloc.c
@@ -19,15 +19,11 @@
+----------------------------------------------------------------------+
*/
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#if defined(__linux__) && defined(HAVE_MEMFD_CREATE)
-# ifndef _GNU_SOURCE
-# define _GNU_SOURCE
+#if defined(__linux__)
+# include <php_config.h>
+# if defined(HAVE_MEMFD_CREATE)
+# include <sys/mman.h>
# endif
-# include <sys/mman.h>
#endif
#include <errno.h>