Skip to content

Commit fe45173

Browse files
committed
Sync CS and macros
1 parent b7db89e commit fe45173

File tree

2 files changed

+63
-5
lines changed

2 files changed

+63
-5
lines changed

cmake/ext/pcntl/CMakeLists.txt

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,18 @@ check_symbol_exists(
7676
HAVE_PTHREAD_SET_QOS_CLASS_SELF_NP
7777
)
7878
check_symbol_exists(rfork "unistd.h" HAVE_RFORK)
79+
cmake_push_check_state(RESET)
80+
set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)
81+
check_symbol_exists(sched_setaffinity "sched.h" HAVE_SCHED_SETAFFINITY)
82+
cmake_pop_check_state()
7983
check_symbol_exists(setpriority "sys/resource.h" HAVE_SETPRIORITY)
8084
check_symbol_exists(sigtimedwait "signal.h" HAVE_SIGTIMEDWAIT)
8185
check_symbol_exists(sigwaitinfo "signal.h" HAVE_SIGWAITINFO)
8286
check_symbol_exists(SYS_pidfd_open "sys/syscall.h" HAVE_PIDFD_OPEN)
87+
cmake_push_check_state(RESET)
88+
set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)
89+
check_symbol_exists(unshare "sched.h" HAVE_UNSHARE)
90+
cmake_pop_check_state()
8391
check_symbol_exists(wait3 "sys/wait.h" HAVE_WAIT3)
8492
check_symbol_exists(wait4 "sys/wait.h" HAVE_WAIT4)
8593
check_symbol_exists(waitid "sys/wait.h" HAVE_WAITID)
@@ -126,9 +134,6 @@ endif()
126134
cmake_push_check_state(RESET)
127135
set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)
128136

129-
check_symbol_exists(unshare "sched.h" HAVE_UNSHARE)
130-
check_symbol_exists(sched_setaffinity "sched.h" HAVE_SCHED_SETAFFINITY)
131-
132137
# Check if sched_getcpu() is supported. Value -1 means ENOSYS in this context.
133138
block()
134139
php_search_libraries(

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

Lines changed: 55 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -402,6 +402,38 @@
402402
/* Define to 1 if you have the 'dcngettext' function. */
403403
#cmakedefine HAVE_DCNGETTEXT 1
404404

405+
/* Define to 1 if you have the declaration of 'P_ALL', and to 0 if you don't.
406+
*/
407+
#cmakedefine01 HAVE_DECL_P_ALL
408+
409+
/* Define to 1 if you have the declaration of 'P_JAILID', and to 0 if you
410+
don't. */
411+
#cmakedefine01 HAVE_DECL_P_JAILID
412+
413+
/* Define to 1 if you have the declaration of 'P_PIDFD', and to 0 if you
414+
don't. */
415+
#cmakedefine01 HAVE_DECL_P_PIDFD
416+
417+
/* Define to 1 if you have the declaration of 'P_UID', and to 0 if you don't.
418+
*/
419+
#cmakedefine01 HAVE_DECL_P_UID
420+
421+
/* Define to 1 if you have the declaration of 'WCONTINUED', and to 0 if you
422+
don't. */
423+
#cmakedefine01 HAVE_DECL_WCONTINUED
424+
425+
/* Define to 1 if you have the declaration of 'WEXITED', and to 0 if you
426+
don't. */
427+
#cmakedefine01 HAVE_DECL_WEXITED
428+
429+
/* Define to 1 if you have the declaration of 'WNOWAIT', and to 0 if you
430+
don't. */
431+
#cmakedefine01 HAVE_DECL_WNOWAIT
432+
433+
/* Define to 1 if you have the declaration of 'WSTOPPED', and to 0 if you
434+
don't. */
435+
#cmakedefine01 HAVE_DECL_WSTOPPED
436+
405437
#undef HAVE_DIRENT_H
406438

407439
/* Define to 1 if you have the 'dngettext' function. */
@@ -543,6 +575,9 @@
543575
/* Define to 1 if you have the 'getaddrinfo' function. */
544576
#cmakedefine HAVE_GETADDRINFO 1
545577

578+
/* Define to 1 if you have the 'getcpuid' function. */
579+
#cmakedefine HAVE_GETCPUID 1
580+
546581
#define HAVE_GETCWD 1
547582

548583
#define HAVE_GETHOSTNAME 1
@@ -768,6 +803,9 @@
768803
/* Define to 1 if the phpdbg SAPI has libedit/readline integration. */
769804
#cmakedefine HAVE_PHPDBG_READLINE 1
770805

806+
/* Define to 1 if you have the 'pidfd_open' function. */
807+
#cmakedefine HAVE_PIDFD_OPEN 1
808+
771809
/* Define to 1 if the PHP extension 'posix' is available. */
772810
#cmakedefine HAVE_POSIX 1
773811

@@ -779,6 +817,12 @@
779817
1.3.0). */
780818
#cmakedefine HAVE_PROGRESS_CALLBACK 1
781819

820+
/* Define to 1 if you have the 'pset_bind' function. */
821+
#cmakedefine HAVE_PSET_BIND 1
822+
823+
/* Define to 1 if you have the 'pthread_set_qos_class_self_np' function. */
824+
#cmakedefine HAVE_PTHREAD_SET_QOS_CLASS_SELF_NP 1
825+
782826
#define HAVE_PUTENV 1
783827

784828
#undef HAVE_PWD_H
@@ -800,6 +844,12 @@
800844
/* Define to 1 if edit/readline library has the 'rl_on_new_line' function. */
801845
#cmakedefine HAVE_RL_ON_NEW_LINE 1
802846

847+
/* Define to 1 if you have the 'sched_setaffinity' function. */
848+
#cmakedefine HAVE_SCHED_SETAFFINITY 1
849+
850+
/* Define to 1 if the 'sched_getcpu' function is properly supported. */
851+
#cmakedefine HAVE_SCHED_GETCPU 1
852+
803853
/* Define to 1 if you have the 'setegid' function. */
804854
#cmakedefine HAVE_SETEGID 1
805855

@@ -979,15 +1029,18 @@
9791029

9801030
#define HAVE_UTIME 1
9811031

982-
/* Define to 1 if you have the 'waitpid' function. */
983-
#cmakedefine HAVE_WAITPID 1
1032+
/* Define to 1 if you have the 'waitid' function. */
1033+
#cmakedefine HAVE_WAITID 1
9841034

9851035
/* Define to 1 if you have the 'wait3' function. */
9861036
#cmakedefine HAVE_WAIT3 1
9871037

9881038
/* Define to 1 if you have the 'wait4' function. */
9891039
#cmakedefine HAVE_WAIT4 1
9901040

1041+
/* Define to 1 if you have the 'WIFCONTINUED' function. */
1042+
#cmakedefine HAVE_WIFCONTINUED 1
1043+
9911044
/* Define to 1 if the PHP extension 'xml' is available. */
9921045
#cmakedefine HAVE_XML 1
9931046

0 commit comments

Comments
 (0)