Module: wine Branch: master Commit: 6fdae1979bace3b2832fe099475e4368f543c13f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6fdae1979bace3b2832fe0994...
Author: Huw Davies huw@codeweavers.com Date: Mon Oct 4 15:40:14 2021 +0100
configure: Stop checking for poll.h and sys/poll.h - always use poll.h.
Signed-off-by: Huw Davies huw@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
configure | 2 -- configure.ac | 2 -- dlls/ntdll/unix/serial.c | 3 --- dlls/ntdll/unix/sync.c | 5 ----- dlls/winebus.sys/bus_udev.c | 7 +------ dlls/wineoss.drv/midi.c | 5 ----- dlls/winex11.drv/event.c | 5 ----- dlls/ws2_32/unixlib.c | 5 ----- include/config.h.in | 6 ------ server/change.c | 4 +--- server/fd.c | 5 ----- server/file.c | 2 -- server/object.h | 5 +---- server/process.c | 2 -- server/queue.c | 4 +--- server/request.c | 2 -- server/serial.c | 4 +--- server/signal.c | 5 ----- server/sock.c | 4 +--- server/thread.c | 2 -- 20 files changed, 6 insertions(+), 73 deletions(-)
diff --git a/configure b/configure index 167d5f161cd..84c5b9bd996 100755 --- a/configure +++ b/configure @@ -7473,7 +7473,6 @@ for ac_header in \ netinet/tcp.h \ netinet/tcp_fsm.h \ pcap/pcap.h \ - poll.h \ port.h \ pthread.h \ pwd.h \ @@ -7496,7 +7495,6 @@ for ac_header in \ sys/modem.h \ sys/mtio.h \ sys/param.h \ - sys/poll.h \ sys/prctl.h \ sys/protosw.h \ sys/ptrace.h \ diff --git a/configure.ac b/configure.ac index c8c09d834f1..7c1e446814b 100644 --- a/configure.ac +++ b/configure.ac @@ -465,7 +465,6 @@ AC_CHECK_HEADERS(\ netinet/tcp.h \ netinet/tcp_fsm.h \ pcap/pcap.h \ - poll.h \ port.h \ pthread.h \ pwd.h \ @@ -488,7 +487,6 @@ AC_CHECK_HEADERS(\ sys/modem.h \ sys/mtio.h \ sys/param.h \ - sys/poll.h \ sys/prctl.h \ sys/protosw.h \ sys/ptrace.h \ diff --git a/dlls/ntdll/unix/serial.c b/dlls/ntdll/unix/serial.c index ece9966f12b..83244d02d41 100644 --- a/dlls/ntdll/unix/serial.c +++ b/dlls/ntdll/unix/serial.c @@ -44,9 +44,6 @@ #ifdef HAVE_SYS_IOCTL_H #include <sys/ioctl.h> #endif -#ifdef HAVE_SYS_POLL_H -# include <sys/poll.h> -#endif #ifdef HAVE_SYS_MODEM_H # include <sys/modem.h> #endif diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index a246fc19618..daf9f46f43b 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -39,12 +39,7 @@ #ifdef HAVE_SYS_TIME_H # include <sys/time.h> #endif -#ifdef HAVE_POLL_H #include <poll.h> -#endif -#ifdef HAVE_SYS_POLL_H -# include <sys/poll.h> -#endif #include <unistd.h> #ifdef HAVE_SCHED_H # include <sched.h> diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 780af549916..1591f00eedf 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -34,12 +34,7 @@ #ifdef HAVE_UNISTD_H # include <unistd.h> #endif -#ifdef HAVE_POLL_H -# include <poll.h> -#endif -#ifdef HAVE_SYS_POLL_H -# include <sys/poll.h> -#endif +#include <poll.h> #ifdef HAVE_LIBUDEV_H # include <libudev.h> #endif diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 24b3e7037b0..1e72dfcf898 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -54,12 +54,7 @@ #ifdef HAVE_SYS_IOCTL_H # include <sys/ioctl.h> #endif -#ifdef HAVE_POLL_H #include <poll.h> -#endif -#ifdef HAVE_SYS_POLL_H -#include <sys/poll.h> -#endif #include <sys/soundcard.h>
#include "windef.h" diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 1772a27c48b..4e401faf403 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -21,12 +21,7 @@
#include "config.h"
-#ifdef HAVE_POLL_H #include <poll.h> -#endif -#ifdef HAVE_SYS_POLL_H -#include <sys/poll.h> -#endif #include <X11/Xatom.h> #include <X11/keysym.h> #include <X11/Xlib.h> diff --git a/dlls/ws2_32/unixlib.c b/dlls/ws2_32/unixlib.c index 25a38b46758..67edf06368e 100644 --- a/dlls/ws2_32/unixlib.c +++ b/dlls/ws2_32/unixlib.c @@ -63,12 +63,7 @@ #ifdef HAVE_IFADDRS_H # include <ifaddrs.h> #endif -#ifdef HAVE_POLL_H #include <poll.h> -#endif -#ifdef HAVE_SYS_POLL_H -# include <sys/poll.h> -#endif #ifdef HAVE_SYS_TIME_H # include <sys/time.h> #endif diff --git a/include/config.h.in b/include/config.h.in index a589411e4ae..09cf7c923e3 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -389,9 +389,6 @@ /* Define to 1 if you have the `pipe2' function. */ #undef HAVE_PIPE2
-/* Define to 1 if you have the <poll.h> header file. */ -#undef HAVE_POLL_H - /* Define to 1 if you have the `port_create' function. */ #undef HAVE_PORT_CREATE
@@ -658,9 +655,6 @@ /* Define to 1 if you have the <sys/param.h> header file. */ #undef HAVE_SYS_PARAM_H
-/* Define to 1 if you have the <sys/poll.h> header file. */ -#undef HAVE_SYS_POLL_H - /* Define to 1 if you have the <sys/prctl.h> header file. */ #undef HAVE_SYS_PRCTL_H
diff --git a/server/change.c b/server/change.c index 4fdb0394922..a01d6894151 100644 --- a/server/change.c +++ b/server/change.c @@ -32,9 +32,7 @@ #include <dirent.h> #include <errno.h> #include <unistd.h> -#ifdef HAVE_POLL_H -# include <poll.h> -#endif +#include <poll.h> #ifdef HAVE_SYS_INOTIFY_H #include <sys/inotify.h> #endif diff --git a/server/fd.c b/server/fd.c index 37e2eddeaba..c9a21186722 100644 --- a/server/fd.c +++ b/server/fd.c @@ -31,12 +31,7 @@ #include <stdio.h> #include <string.h> #include <stdlib.h> -#ifdef HAVE_POLL_H #include <poll.h> -#endif -#ifdef HAVE_SYS_POLL_H -#include <sys/poll.h> -#endif #ifdef HAVE_LINUX_MAJOR_H #include <linux/major.h> #endif diff --git a/server/file.c b/server/file.c index 7cf6f3c0472..062322f685d 100644 --- a/server/file.c +++ b/server/file.c @@ -35,9 +35,7 @@ #ifdef HAVE_UTIME_H #include <utime.h> #endif -#ifdef HAVE_POLL_H #include <poll.h> -#endif
#include "ntstatus.h" #define WIN32_NO_STATUS diff --git a/server/object.h b/server/object.h index 039bf4e7d4e..97d6c0e91f8 100644 --- a/server/object.h +++ b/server/object.h @@ -21,10 +21,7 @@ #ifndef __WINE_SERVER_OBJECT_H #define __WINE_SERVER_OBJECT_H
-#ifdef HAVE_SYS_POLL_H -#include <sys/poll.h> -#endif - +#include <poll.h> #include <sys/time.h> #include "wine/server_protocol.h" #include "wine/list.h" diff --git a/server/process.c b/server/process.c index 6eda0bb0191..48b5d6d6dd4 100644 --- a/server/process.c +++ b/server/process.c @@ -35,9 +35,7 @@ # include <sys/socket.h> #endif #include <unistd.h> -#ifdef HAVE_POLL_H #include <poll.h> -#endif
#include "ntstatus.h" #define WIN32_NO_STATUS diff --git a/server/queue.c b/server/queue.c index fe5a3f2d5be..63a3a1fe2db 100644 --- a/server/queue.c +++ b/server/queue.c @@ -25,9 +25,7 @@ #include <stdio.h> #include <stdlib.h> #include <unistd.h> -#ifdef HAVE_POLL_H -# include <poll.h> -#endif +#include <poll.h>
#include "ntstatus.h" #define WIN32_NO_STATUS diff --git a/server/request.c b/server/request.c index 4733cef6511..b7d2713aaa5 100644 --- a/server/request.c +++ b/server/request.c @@ -47,9 +47,7 @@ #include <sys/un.h> #endif #include <unistd.h> -#ifdef HAVE_POLL_H #include <poll.h> -#endif #ifdef __APPLE__ # include <mach/mach_time.h> #endif diff --git a/server/serial.c b/server/serial.c index 81926f6d412..e84da228125 100644 --- a/server/serial.c +++ b/server/serial.c @@ -32,6 +32,7 @@ #include <sys/types.h> #include <time.h> #include <unistd.h> +#include <poll.h> #ifdef HAVE_UTIME_H #include <utime.h> #endif @@ -41,9 +42,6 @@ #ifdef HAVE_SYS_IOCTL_H #include <sys/ioctl.h> #endif -#ifdef HAVE_POLL_H -#include <poll.h> -#endif
#include "ntstatus.h" #define WIN32_NO_STATUS diff --git a/server/signal.c b/server/signal.c index 0c22c157f2b..19b76d44c16 100644 --- a/server/signal.c +++ b/server/signal.c @@ -23,12 +23,7 @@ #include <signal.h> #include <stdio.h> #include <sys/time.h> -#ifdef HAVE_POLL_H #include <poll.h> -#endif -#ifdef HAVE_SYS_POLL_H -#include <sys/poll.h> -#endif #ifdef HAVE_SYS_RESOURCE_H #include <sys/resource.h> #endif diff --git a/server/sock.c b/server/sock.c index 4cb5503ad25..c9b71137c4c 100644 --- a/server/sock.c +++ b/server/sock.c @@ -39,9 +39,7 @@ #ifdef HAVE_NETINET_IN_H # include <netinet/in.h> #endif -#ifdef HAVE_POLL_H -# include <poll.h> -#endif +#include <poll.h> #include <sys/time.h> #include <sys/types.h> #ifdef HAVE_SYS_SOCKET_H diff --git a/server/thread.c b/server/thread.c index 7118f29bf67..b85df68af92 100644 --- a/server/thread.c +++ b/server/thread.c @@ -31,9 +31,7 @@ #include <sys/types.h> #include <unistd.h> #include <time.h> -#ifdef HAVE_POLL_H #include <poll.h> -#endif #ifdef HAVE_SCHED_H #include <sched.h> #endif
-
Alexandre Julliard