Module: wine Branch: master Commit: 411592bf45ef73543a68618432c295a1d279e574 URL: https://source.winehq.org/git/wine.git/?a=commit;h=411592bf45ef73543a6861843...
Author: Alexandre Julliard julliard@winehq.org Date: Thu Dec 9 11:10:43 2021 +0100
configure: Assume that sys/wait.h is available on Unix.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
configure | 6 ------ configure.ac | 1 - dlls/ntdll/unix/loader.c | 4 +--- dlls/ntdll/unix/process.c | 4 +--- dlls/ntdll/unix/server.c | 2 -- include/config.h.in | 3 --- libs/wine/mmap.c | 2 -- server/ptrace.c | 4 +--- server/request.c | 4 +--- 9 files changed, 4 insertions(+), 26 deletions(-)
diff --git a/configure b/configure index 00e3e7844a1..09e8530446a 100755 --- a/configure +++ b/configure @@ -8677,12 +8677,6 @@ if test "x$ac_cv_header_sys_vnode_h" = xyes then : printf "%s\n" "#define HAVE_SYS_VNODE_H 1" >>confdefs.h
-fi -ac_fn_c_check_header_compile "$LINENO" "sys/wait.h" "ac_cv_header_sys_wait_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_wait_h" = xyes -then : - printf "%s\n" "#define HAVE_SYS_WAIT_H 1" >>confdefs.h - fi ac_fn_c_check_header_compile "$LINENO" "syscall.h" "ac_cv_header_syscall_h" "$ac_includes_default" if test "x$ac_cv_header_syscall_h" = xyes diff --git a/configure.ac b/configure.ac index 760e4f0ed04..8ef1fbbd694 100644 --- a/configure.ac +++ b/configure.ac @@ -505,7 +505,6 @@ AC_CHECK_HEADERS(\ sys/user.h \ sys/utsname.h \ sys/vnode.h \ - sys/wait.h \ syscall.h \ utime.h \ valgrind/memcheck.h \ diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index cc365fd37d1..8f20da7eece 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -35,6 +35,7 @@ #include <sys/types.h> #include <sys/stat.h> #include <sys/mman.h> +#include <sys/wait.h> #include <unistd.h> #include <dlfcn.h> #ifdef HAVE_PWD_H @@ -52,9 +53,6 @@ #ifdef HAVE_SYS_RESOURCE_H # include <sys/resource.h> #endif -#ifdef HAVE_SYS_WAIT_H -#include <sys/wait.h> -#endif #include <limits.h> #ifdef HAVE_SYS_SYSCTL_H # include <sys/sysctl.h> diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index a07bbf43a6e..23aa340359e 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -39,9 +39,7 @@ # include <sys/times.h> #endif #include <sys/types.h> -#ifdef HAVE_SYS_WAIT_H -# include <sys/wait.h> -#endif +#include <sys/wait.h> #ifdef HAVE_SYS_SYSCTL_H # include <sys/sysctl.h> #endif diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 8c8dcf24477..a388247beb2 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -45,9 +45,7 @@ #include <sys/types.h> #include <sys/mman.h> #include <sys/socket.h> -#ifdef HAVE_SYS_WAIT_H #include <sys/wait.h> -#endif #ifdef HAVE_SYS_UN_H #include <sys/un.h> #endif diff --git a/include/config.h.in b/include/config.h.in index 7f57ce10a7d..2bd8d2fa1ae 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -733,9 +733,6 @@ /* Define to 1 if you have the <sys/vnode.h> header file. */ #undef HAVE_SYS_VNODE_H
-/* Define to 1 if you have the <sys/wait.h> header file. */ -#undef HAVE_SYS_WAIT_H - /* Define to 1 if you have the `tcdrain' function. */ #undef HAVE_TCDRAIN
diff --git a/libs/wine/mmap.c b/libs/wine/mmap.c index c8d1b59a4db..ad51153d039 100644 --- a/libs/wine/mmap.c +++ b/libs/wine/mmap.c @@ -28,9 +28,7 @@ #include <stdio.h> #include <string.h> #include <sys/types.h> -#ifdef HAVE_SYS_WAIT_H #include <sys/wait.h> -#endif #include <sys/mman.h> #include <unistd.h> #ifdef HAVE_STDINT_H diff --git a/server/ptrace.c b/server/ptrace.c index 1875e1dfd56..976d3a3778e 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -27,15 +27,13 @@ #include <signal.h> #include <stdarg.h> #include <sys/types.h> +#include <sys/wait.h> #ifdef HAVE_SYS_PTRACE_H # include <sys/ptrace.h> #endif #ifdef HAVE_SYS_PARAM_H # include <sys/param.h> #endif -#ifdef HAVE_SYS_WAIT_H -# include <sys/wait.h> -#endif #ifdef HAVE_SYS_SYSCALL_H # include <sys/syscall.h> #endif diff --git a/server/request.c b/server/request.c index 086e5f63919..7021741c765 100644 --- a/server/request.c +++ b/server/request.c @@ -35,9 +35,7 @@ #include <sys/time.h> #include <sys/types.h> #include <sys/socket.h> -#ifdef HAVE_SYS_WAIT_H -# include <sys/wait.h> -#endif +#include <sys/wait.h> #ifdef HAVE_SYS_UIO_H #include <sys/uio.h> #endif