Merge branch 'PHP-8.3' into PHP-8.4

Author: petk

cmake/ext/hash/config.cmake.h.in

@@ -1,5 +1,5 @@
-/* Define to 1 if mhash support is enabled. */
-#cmakedefine PHP_MHASH_BC 1
-
 /* Define to 1 if the PHP hash extension uses the slow SHA3 algorithm. */
 #cmakedefine HAVE_SLOW_HASH3 1
+
+/* Define to 1 if mhash support is enabled. */
+#cmakedefine PHP_MHASH_BC 1

cmake/ext/intl/CMakeLists.txt

@@ -194,5 +194,3 @@ if(ICU_VERSION VERSION_GREATER_EQUAL 60)
 endif()
 
 add_dependencies(php_intl php_date)
-
-configure_file(config.cmake.h.in config.h @ONLY)

cmake/ext/intl/config.cmake.h.in

@@ -1,8 +1,8 @@
 /* Define to 1 if you have the 'arc4random_buf' function. */
 #cmakedefine HAVE_ARC4RANDOM_BUF 1
 
-/* Define to 1 if you have the 'getrandom' function. */
-#cmakedefine HAVE_GETRANDOM 1
-
 /* Define to 1 if you have the <CommonCrypto/CommonRandom.h> header file. */
 #cmakedefine HAVE_COMMONCRYPTO_COMMONRANDOM_H 1
+
+/* Define to 1 if you have the 'getrandom' function. */
+#cmakedefine HAVE_GETRANDOM 1

cmake/ext/random/config.cmake.h.in

@@ -3,3 +3,15 @@
 
 /* Define to 1 if the PHP extension 'session' is available. */
 #cmakedefine HAVE_PHP_SESSION 1
+
+/* Define to 1 if you have the 'pread' function. */
+#cmakedefine HAVE_PREAD 1
+
+/* Define to 1 if you have the 'pwrite' function. */
+#cmakedefine HAVE_PWRITE 1
+
+/* Define to 1 if 'pread' declaration with 'off64_t' is missing. */
+#cmakedefine PHP_PREAD_64 1
+
+/* Define to 1 if 'pwrite' declaration with 'off64_t' is missing. */
+#cmakedefine PHP_PWRITE_64 1

cmake/ext/session/config.cmake.h.in

@@ -342,9 +342,6 @@
 /* Define to 1 if you have the 'prctl' function. */
 #cmakedefine HAVE_PRCTL 1
 
-/* Define to 1 if you have the 'pread' function. */
-#cmakedefine HAVE_PREAD 1
-
 /* Define to 1 if you have the 'procctl' function. */
 #cmakedefine HAVE_PROCCTL 1
 
@@ -369,9 +366,6 @@
 /* Define to 1 if you have the <pwd.h> header file. */
 #cmakedefine HAVE_PWD_H 1
 
-/* Define to 1 if you have the 'pwrite' function. */
-#cmakedefine HAVE_PWRITE 1
-
 /* Define to 1 if you have the <resolv.h> header file. */
 #cmakedefine HAVE_RESOLV_H 1
 
@@ -720,12 +714,6 @@
 /* The 'uname' output. */
 #define PHP_OS "@CMAKE_SYSTEM_NAME@"
 
-/* Define to 1 if 'pread' declaration with 'off64_t' is missing. */
-#cmakedefine PHP_PREAD_64 1
-
-/* Define to 1 if 'pwrite' declaration with 'off64_t' is missing. */
-#cmakedefine PHP_PWRITE_64 1
-
 /* Define to 1 if PHP uses its own SIGCHLD handler, and to 0 if not. */
 #cmakedefine01 PHP_SIGCHILD