Module: wine Branch: master Commit: e3001b6a7c087da5a680b412d82da878e0149e8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3001b6a7c087da5a680b412d...
Author: Alexandre Julliard julliard@winehq.org Date: Thu Dec 9 11:02:24 2021 +0100
configure: Assume that sys/mman.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/server.c | 4 +--- dlls/ntdll/unix/sync.c | 2 -- dlls/ntdll/unix/thread.c | 2 -- dlls/ntdll/unix/virtual.c | 4 +--- dlls/qcap/v4l.c | 2 -- dlls/win32u/freetype.c | 4 +--- include/config.h.in | 3 --- libs/wine/loader.c | 2 -- libs/wine/mmap.c | 2 -- loader/preloader.c | 4 +--- loader/preloader_mac.c | 4 +--- server/mapping.c | 4 +--- 15 files changed, 7 insertions(+), 41 deletions(-)
diff --git a/configure b/configure index c1fdaef554a..7fdc83547f1 100755 --- a/configure +++ b/configure @@ -8539,12 +8539,6 @@ if test "x$ac_cv_header_sys_link_h" = xyes then : printf "%s\n" "#define HAVE_SYS_LINK_H 1" >>confdefs.h
-fi -ac_fn_c_check_header_compile "$LINENO" "sys/mman.h" "ac_cv_header_sys_mman_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_mman_h" = xyes -then : - printf "%s\n" "#define HAVE_SYS_MMAN_H 1" >>confdefs.h - fi ac_fn_c_check_header_compile "$LINENO" "sys/modem.h" "ac_cv_header_sys_modem_h" "$ac_includes_default" if test "x$ac_cv_header_sys_modem_h" = xyes diff --git a/configure.ac b/configure.ac index b8465cc7489..ef25cfe1d97 100644 --- a/configure.ac +++ b/configure.ac @@ -482,7 +482,6 @@ AC_CHECK_HEADERS(\ sys/ioctl.h \ sys/ipc.h \ sys/link.h \ - sys/mman.h \ sys/modem.h \ sys/mtio.h \ sys/param.h \ diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index ba56b5e20d5..cc365fd37d1 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -34,6 +34,7 @@ #include <stdlib.h> #include <sys/types.h> #include <sys/stat.h> +#include <sys/mman.h> #include <unistd.h> #include <dlfcn.h> #ifdef HAVE_PWD_H @@ -48,9 +49,6 @@ #ifdef HAVE_SYS_AUXV_H # include <sys/auxv.h> #endif -#ifdef HAVE_SYS_MMAN_H -# include <sys/mman.h> -#endif #ifdef HAVE_SYS_RESOURCE_H # include <sys/resource.h> #endif diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 1dcd0792072..caee1f794db 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -43,6 +43,7 @@ #include <stdlib.h> #include <string.h> #include <sys/types.h> +#include <sys/mman.h> #ifdef HAVE_SYS_SOCKET_H # include <sys/socket.h> #endif @@ -52,9 +53,6 @@ #ifdef HAVE_SYS_UN_H #include <sys/un.h> #endif -#ifdef HAVE_SYS_MMAN_H -#include <sys/mman.h> -#endif #ifdef HAVE_SYS_PRCTL_H # include <sys/prctl.h> #endif diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index d5d92145503..51505082862 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -33,9 +33,7 @@ #include <limits.h> #include <signal.h> #include <sys/types.h> -#ifdef HAVE_SYS_MMAN_H #include <sys/mman.h> -#endif #ifdef HAVE_SYS_SYSCALL_H #include <sys/syscall.h> #endif diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 00fe2b6fa1b..618ebb82bfb 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -35,9 +35,7 @@ #include <signal.h> #include <sys/types.h> #include <unistd.h> -#ifdef HAVE_SYS_MMAN_H #include <sys/mman.h> -#endif #ifdef HAVE_SYS_TIMES_H #include <sys/times.h> #endif diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index dea16623de7..2ed7a74b875 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -37,9 +37,7 @@ # include <sys/socket.h> #endif #include <sys/stat.h> -#ifdef HAVE_SYS_MMAN_H -# include <sys/mman.h> -#endif +#include <sys/mman.h> #ifdef HAVE_SYS_SYSINFO_H # include <sys/sysinfo.h> #endif diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index 828113afa3c..9a66a50e31d 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -35,9 +35,7 @@ #ifdef HAVE_SYS_IOCTL_H #include <sys/ioctl.h> #endif -#ifdef HAVE_SYS_MMAN_H #include <sys/mman.h> -#endif #include <errno.h> #ifdef HAVE_SYS_TIME_H #include <sys/time.h> diff --git a/dlls/win32u/freetype.c b/dlls/win32u/freetype.c index 48fae25a87e..77f4ef8eab3 100644 --- a/dlls/win32u/freetype.c +++ b/dlls/win32u/freetype.c @@ -33,9 +33,7 @@ #include <sys/stat.h> #include <fcntl.h> #include <dlfcn.h> -#ifdef HAVE_SYS_MMAN_H -# include <sys/mman.h> -#endif +#include <sys/mman.h> #include <string.h> #include <dirent.h> #include <stdio.h> diff --git a/include/config.h.in b/include/config.h.in index 9ff8a89f888..8ad37e3d479 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -637,9 +637,6 @@ /* Define to 1 if you have the <sys/link.h> header file. */ #undef HAVE_SYS_LINK_H
-/* Define to 1 if you have the <sys/mman.h> header file. */ -#undef HAVE_SYS_MMAN_H - /* Define to 1 if you have the <sys/modem.h> header file. */ #undef HAVE_SYS_MODEM_H
diff --git a/libs/wine/loader.c b/libs/wine/loader.c index edb6e37061d..ad72ec50904 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c @@ -28,9 +28,7 @@ #include <stdlib.h> #include <string.h> #include <sys/types.h> -#ifdef HAVE_SYS_MMAN_H #include <sys/mman.h> -#endif #ifdef HAVE_SYS_RESOURCE_H # include <sys/resource.h> #endif diff --git a/libs/wine/mmap.c b/libs/wine/mmap.c index 86b25b0a7ac..c8d1b59a4db 100644 --- a/libs/wine/mmap.c +++ b/libs/wine/mmap.c @@ -31,9 +31,7 @@ #ifdef HAVE_SYS_WAIT_H #include <sys/wait.h> #endif -#ifdef HAVE_SYS_MMAN_H #include <sys/mman.h> -#endif #include <unistd.h> #ifdef HAVE_STDINT_H # include <stdint.h> diff --git a/loader/preloader.c b/loader/preloader.c index 7bd6afaeb66..585be50624f 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -71,9 +71,7 @@ #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#ifdef HAVE_SYS_MMAN_H -# include <sys/mman.h> -#endif +#include <sys/mman.h> #ifdef HAVE_SYS_SYSCALL_H # include <sys/syscall.h> #endif diff --git a/loader/preloader_mac.c b/loader/preloader_mac.c index 23eee44975f..01a41f08d8c 100644 --- a/loader/preloader_mac.c +++ b/loader/preloader_mac.c @@ -33,9 +33,7 @@ #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#ifdef HAVE_SYS_MMAN_H -# include <sys/mman.h> -#endif +#include <sys/mman.h> #ifdef HAVE_SYS_SYSCALL_H # include <sys/syscall.h> #endif diff --git a/server/mapping.c b/server/mapping.c index 93dae94b7c4..bc9ed5bdcb9 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -27,9 +27,7 @@ #include <stdlib.h> #include <sys/types.h> #include <sys/stat.h> -#ifdef HAVE_SYS_MMAN_H -# include <sys/mman.h> -#endif +#include <sys/mman.h> #include <unistd.h>
#include "ntstatus.h"
-
Alexandre Julliard