Merge branch 'PHP-8.3'

Author: petk

cmake/ext/pcntl/CMakeLists.txt

@@ -69,6 +69,25 @@ endblock()
 check_symbol_exists(forkx "sys/fork.h" HAVE_FORKX)
 check_symbol_exists(getcpuid "sys/processor.h" HAVE_GETCPUID)
 check_symbol_exists(getpriority "sys/resource.h" HAVE_GETPRIORITY)
+check_symbol_exists(pset_bind "sys/pset.h" HAVE_PSET_BIND)
+check_symbol_exists(
+  pthread_set_qos_class_self_np
+  "pthread/qos.h"
+  HAVE_PTHREAD_SET_QOS_CLASS_SELF_NP
+)
+check_symbol_exists(rfork "unistd.h" HAVE_RFORK)
+check_symbol_exists(setpriority "sys/resource.h" HAVE_SETPRIORITY)
+check_symbol_exists(sigtimedwait "signal.h" HAVE_SIGTIMEDWAIT)
+check_symbol_exists(sigwaitinfo "signal.h" HAVE_SIGWAITINFO)
+check_symbol_exists(SYS_pidfd_open "sys/syscall.h" HAVE_PIDFD_OPEN)
+check_symbol_exists(wait3 "sys/wait.h" HAVE_WAIT3)
+check_symbol_exists(wait4 "sys/wait.h" HAVE_WAIT4)
+check_symbol_exists(waitid "sys/wait.h" HAVE_WAITID)
+check_symbol_exists(WCONTINUED "sys/wait.h" HAVE_DECL_WCONTINUED)
+check_symbol_exists(WEXITED "sys/wait.h" HAVE_DECL_WEXITED)
+check_symbol_exists(WIFCONTINUED "sys/wait.h" HAVE_WIFCONTINUED)
+check_symbol_exists(WNOWAIT "sys/wait.h" HAVE_DECL_WNOWAIT)
+check_symbol_exists(WSTOPPED "sys/wait.h" HAVE_DECL_WSTOPPED)
 
 cmake_push_check_state(RESET)
   # Some of these enum values require _GNU_SOURCE.
@@ -95,26 +114,6 @@ cmake_push_check_state(RESET)
   ]] HAVE_DECL_P_UID)
 cmake_pop_check_state()
 
-check_symbol_exists(pset_bind "sys/pset.h" HAVE_PSET_BIND)
-check_symbol_exists(
-  pthread_set_qos_class_self_np
-  "pthread/qos.h"
-  HAVE_PTHREAD_SET_QOS_CLASS_SELF_NP
-)
-check_symbol_exists(rfork "unistd.h" HAVE_RFORK)
-check_symbol_exists(setpriority "sys/resource.h" HAVE_SETPRIORITY)
-check_symbol_exists(sigtimedwait "signal.h" HAVE_SIGTIMEDWAIT)
-check_symbol_exists(sigwaitinfo "signal.h" HAVE_SIGWAITINFO)
-check_symbol_exists(SYS_pidfd_open "sys/syscall.h" HAVE_PIDFD_OPEN)
-check_symbol_exists(wait3 "sys/wait.h" HAVE_WAIT3)
-check_symbol_exists(wait4 "sys/wait.h" HAVE_WAIT4)
-check_symbol_exists(waitid "sys/wait.h" HAVE_WAITID)
-check_symbol_exists(WCONTINUED "sys/wait.h" HAVE_DECL_WCONTINUED)
-check_symbol_exists(WEXITED "sys/wait.h" HAVE_DECL_WEXITED)
-check_symbol_exists(WIFCONTINUED "sys/wait.h" HAVE_WIFCONTINUED)
-check_symbol_exists(WNOWAIT "sys/wait.h" HAVE_DECL_WNOWAIT)
-check_symbol_exists(WSTOPPED "sys/wait.h" HAVE_DECL_WSTOPPED)
-
 cmake_push_check_state(RESET)
   set(CMAKE_EXTRA_INCLUDE_FILES "signal.h")
   check_type_size(siginfo_t HAVE_STRUCT_SIGINFO_T)

cmake/main/config.w32.cmake.h.in

@@ -478,6 +478,12 @@
 /* Define to 1 if you have the 'fopencookie' function. */
 #cmakedefine HAVE_FOPENCOOKIE 1
 
+/* Define to 1 if you have the 'fork' function. */
+#cmakedefine HAVE_FORK 1
+
+/* Define to 1 if you have the 'forkx' function. */
+#cmakedefine HAVE_FORKX 1
+
 /* Define to 1 if you have the 'fpathconf' function. */
 #cmakedefine HAVE_FPATHCONF 1
 
@@ -552,6 +558,9 @@
 /* Define to 1 if you have the 'getpgid' function. */
 #cmakedefine HAVE_GETPGID 1
 
+/* Define to 1 if you have the 'getpriority' function. */
+#cmakedefine HAVE_GETPRIORITY 1
+
 #define HAVE_GETPROTOBYNAME 1
 
 #define HAVE_GETPROTOBYNUMBER 1
@@ -777,6 +786,9 @@
 /* Define to 1 if OpenSSL crypto library has the 'RAND_egd' function. */
 #cmakedefine HAVE_RAND_EGD 1
 
+/* Define to 1 if you have the 'rfork' function. */
+#cmakedefine HAVE_RFORK 1
+
 /* Define to 1 if edit/readline library has the 'rl_callback_read_char'
    function. */
 #cmakedefine HAVE_RL_CALLBACK_READ_CHAR 1
@@ -794,6 +806,9 @@
 /* Define to 1 if you have the 'seteuid' function. */
 #cmakedefine HAVE_SETEUID 1
 
+/* Define to 1 if you have the 'setpriority' function. */
+#cmakedefine HAVE_SETPRIORITY 1
+
 /* Define to 1 if libzip library has the 'zip_file_set_mtime' function
    (available since 1.0.0). */
 #cmakedefine HAVE_SET_MTIME 1
@@ -817,6 +832,15 @@
 /* Define to 1 if you have the 'setsid' function. */
 #cmakedefine HAVE_SETSID 1
 
+/* Define to 1 if you have the 'sigaction' function. */
+#cmakedefine HAVE_SIGACTION 1
+
+/* Define to 1 if you have the 'sigtimedwait' function. */
+#cmakedefine HAVE_SIGTIMEDWAIT 1
+
+/* Define to 1 if you have the 'sigwaitinfo' function. */
+#cmakedefine HAVE_SIGWAITINFO 1
+
 /* Define to 1 if the odbc extension uses the Solid DB. */
 #cmakedefine HAVE_SOLID 1
 
@@ -937,18 +961,33 @@
 /* Define to 1 if the PHP extension 'odbc' is available. */
 #cmakedefine HAVE_UODBC 1
 
-/* Define to 1 if you have the 'utimes' function. */
-#cmakedefine HAVE_UTIMES 1
-
 /* Define to 1 if the system has the type 'union semun'. */
 #cmakedefine HAVE_UNION_SEMUN 1
 
+/* Define to 1 if you have the 'utimes' function. */
+#cmakedefine HAVE_UTIMES 1
+
 #undef HAVE_UNISTD_H
 
+/* Define to 1 if you have the 'unshare' function. */
+#cmakedefine HAVE_UNSHARE 1
+
 #define HAVE_USLEEP 1
 
+/* Define to 1 if you have the 'utimes' function. */
+#cmakedefine HAVE_UTIMES 1
+
 #define HAVE_UTIME 1
 
+/* Define to 1 if you have the 'waitpid' function. */
+#cmakedefine HAVE_WAITPID 1
+
+/* Define to 1 if you have the 'wait3' function. */
+#cmakedefine HAVE_WAIT3 1
+
+/* Define to 1 if you have the 'wait4' function. */
+#cmakedefine HAVE_WAIT4 1
+
 /* Define to 1 if the PHP extension 'xml' is available. */
 #cmakedefine HAVE_XML 1