Skip to content

Commit af41de5

Browse files
committed
Sync with upstream: ext/pcntl
1 parent 25f1e6b commit af41de5

File tree

2 files changed

+21
-4
lines changed

2 files changed

+21
-4
lines changed

cmake/ext/pcntl/CMakeLists.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,13 +119,19 @@ cmake_pop_check_state()
119119
check_symbol_exists(setpriority sys/resource.h HAVE_SETPRIORITY)
120120
check_symbol_exists(sigtimedwait signal.h HAVE_SIGTIMEDWAIT)
121121
check_symbol_exists(sigwaitinfo signal.h HAVE_SIGWAITINFO)
122-
check_symbol_exists(SYS_pidfd_open sys/syscall.h HAVE_PIDFD_OPEN)
122+
check_symbol_exists(SYS_pidfd_open sys/syscall.h HAVE_DECL_SYS_PIDFD_OPEN)
123+
check_symbol_exists(SYS_waitid sys/syscall.h HAVE_DECL_SYS_WAITID)
124+
cmake_push_check_state(RESET)
125+
set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)
126+
check_symbol_exists(syscall "sys/syscall.h;unistd.h" HAVE_SYSCALL)
127+
cmake_pop_check_state()
123128
cmake_push_check_state(RESET)
124129
set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)
125130
check_symbol_exists(unshare sched.h HAVE_UNSHARE)
126131
cmake_pop_check_state()
127132
check_symbol_exists(wait3 sys/wait.h HAVE_WAIT3)
128133
check_symbol_exists(wait4 sys/wait.h HAVE_WAIT4)
134+
check_symbol_exists(wait6 sys/wait.h HAVE_WAIT6)
129135
check_symbol_exists(waitid sys/wait.h HAVE_WAITID)
130136
check_symbol_exists(WCONTINUED sys/wait.h HAVE_DECL_WCONTINUED)
131137
check_symbol_exists(WEXITED sys/wait.h HAVE_DECL_WEXITED)

cmake/ext/pcntl/cmake/config.h.in

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,14 @@
1414
*/
1515
#cmakedefine01 HAVE_DECL_P_UID
1616

17+
/* Define to 1 if you have the declaration of 'SYS_pidfd_open', and to 0 if
18+
you don't. */
19+
#cmakedefine01 HAVE_DECL_SYS_PIDFD_OPEN
20+
21+
/* Define to 1 if you have the declaration of 'SYS_waitid', and to 0 if you
22+
don't. */
23+
#cmakedefine01 HAVE_DECL_SYS_WAITID
24+
1725
/* Define to 1 if you have the declaration of 'WCONTINUED', and to 0 if you
1826
don't. */
1927
#cmakedefine01 HAVE_DECL_WCONTINUED
@@ -39,9 +47,6 @@
3947
/* Define to 1 if you have the 'getpriority' function. */
4048
#cmakedefine HAVE_GETPRIORITY 1
4149

42-
/* Define to 1 if you have the 'pidfd_open' function. */
43-
#cmakedefine HAVE_PIDFD_OPEN 1
44-
4550
/* Define to 1 if you have the 'pset_bind' function. */
4651
#cmakedefine HAVE_PSET_BIND 1
4752

@@ -66,6 +71,9 @@
6671
/* Define to 1 if you have the 'sigwaitinfo' function. */
6772
#cmakedefine HAVE_SIGWAITINFO 1
6873

74+
/* Define to 1 if you have the 'syscall' function. */
75+
#cmakedefine HAVE_SYSCALL
76+
6977
/* Define to 1 if you have the 'unshare' function. */
7078
#cmakedefine HAVE_UNSHARE 1
7179

@@ -75,6 +83,9 @@
7583
/* Define to 1 if you have the 'wait4' function. */
7684
#cmakedefine HAVE_WAIT4 1
7785

86+
/* Define to 1 if you have the 'wait6' function. */
87+
#cmakedefine HAVE_WAIT6 1
88+
7889
/* Define to 1 if you have the 'waitid' function. */
7990
#cmakedefine HAVE_WAITID 1
8091

0 commit comments

Comments
 (0)