[PATCH 3/3] configure: Stop checking for poll.h and sys/poll.h - always use poll.h.
Huw Davies
huw at codeweavers.com
Mon Oct 4 09:40:14 CDT 2021
Signed-off-by: Huw Davies <huw at codeweavers.com>
---
configure.ac | 2 --
dlls/dinput/joystick_linux.c | 4 +---
dlls/dinput/joystick_linuxinput.c | 4 +---
dlls/iphlpapi/icmp.c | 4 +---
dlls/ntdll/unix/file.c | 2 --
dlls/ntdll/unix/serial.c | 4 +---
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 -----
programs/winedbg/gdbproxy.c | 4 +---
server/change.c | 4 +---
server/fd.c | 5 -----
server/file.c | 2 --
server/object.h | 4 +---
server/process.c | 2 --
server/queue.c | 4 +---
server/request.c | 2 --
server/serial.c | 2 --
server/signal.c | 5 -----
server/sock.c | 4 +---
server/thread.c | 2 --
23 files changed, 10 insertions(+), 77 deletions(-)
diff --git a/configure.ac b/configure.ac
index 6e82e4fbb8d..649f1e7127a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -482,7 +482,6 @@ AC_CHECK_HEADERS(\
netinet/tcp.h \
netinet/tcp_fsm.h \
pcap/pcap.h \
- poll.h \
port.h \
pthread.h \
pwd.h \
@@ -505,7 +504,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/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c
index 5b54e352c20..6df479ebfa3 100644
--- a/dlls/dinput/joystick_linux.c
+++ b/dlls/dinput/joystick_linux.c
@@ -50,9 +50,7 @@
# include <linux/joystick.h>
# undef SW_MAX
#endif
-#ifdef HAVE_SYS_POLL_H
-# include <sys/poll.h>
-#endif
+#include <poll.h>
#include "wine/debug.h"
#include "wine/unicode.h"
diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c
index 949fd1da081..ed385ef5b01 100644
--- a/dlls/dinput/joystick_linuxinput.c
+++ b/dlls/dinput/joystick_linuxinput.c
@@ -46,9 +46,7 @@
# define HAS_PROPER_HEADER
# endif
#endif
-#ifdef HAVE_SYS_POLL_H
-# include <sys/poll.h>
-#endif
+#include <poll.h>
#include "wine/debug.h"
#include "wine/unicode.h"
diff --git a/dlls/iphlpapi/icmp.c b/dlls/iphlpapi/icmp.c
index 8ef03219e52..29ea074a5ab 100644
--- a/dlls/iphlpapi/icmp.c
+++ b/dlls/iphlpapi/icmp.c
@@ -59,9 +59,7 @@
#ifdef HAVE_ARPA_INET_H
# include <arpa/inet.h>
#endif
-#ifdef HAVE_SYS_POLL_H
-# include <sys/poll.h>
-#endif
+#include <poll.h>
#define USE_WS_PREFIX
diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c
index 43e85b0c955..2798fac2678 100644
--- a/dlls/ntdll/unix/file.c
+++ b/dlls/ntdll/unix/file.c
@@ -40,9 +40,7 @@
#ifdef HAVE_MNTENT_H
#include <mntent.h>
#endif
-#ifdef HAVE_POLL_H
#include <poll.h>
-#endif
#ifdef HAVE_SYS_STAT_H
# include <sys/stat.h>
#endif
diff --git a/dlls/ntdll/unix/serial.c b/dlls/ntdll/unix/serial.c
index ab2ef9330a5..cbcf223ca1d 100644
--- a/dlls/ntdll/unix/serial.c
+++ b/dlls/ntdll/unix/serial.c
@@ -49,9 +49,7 @@
#ifdef HAVE_SYS_IOCTL_H
#include <sys/ioctl.h>
#endif
-#ifdef HAVE_SYS_POLL_H
-# include <sys/poll.h>
-#endif
+#include <poll.h>
#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 5a5d49bf4bd..d9d0736a055 100644
--- a/dlls/ntdll/unix/sync.c
+++ b/dlls/ntdll/unix/sync.c
@@ -38,12 +38,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
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c
index f7f507f4f1f..7b789684bbc 100644
--- a/dlls/winebus.sys/bus_udev.c
+++ b/dlls/winebus.sys/bus_udev.c
@@ -32,12 +32,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/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c
index b64abd6f205..f8d40f3ed32 100644
--- a/programs/winedbg/gdbproxy.c
+++ b/programs/winedbg/gdbproxy.c
@@ -34,9 +34,7 @@
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
-#ifdef HAVE_SYS_POLL_H
-# include <sys/poll.h>
-#endif
+#include <poll.h>
#ifdef HAVE_SYS_WAIT_H
# include <sys/wait.h>
#endif
diff --git a/server/change.c b/server/change.c
index 5edeebf89d3..2573a315657 100644
--- a/server/change.c
+++ b/server/change.c
@@ -32,9 +32,7 @@
#include <limits.h>
#include <dirent.h>
#include <errno.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 ad1b7a1bd4a..cc81be06086 100644
--- a/server/fd.c
+++ b/server/fd.c
@@ -32,12 +32,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 2c7cb0ce5ca..a5fd150b37f 100644
--- a/server/file.c
+++ b/server/file.c
@@ -36,9 +36,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..465cd9bfc44 100644
--- a/server/object.h
+++ b/server/object.h
@@ -21,9 +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"
diff --git a/server/process.c b/server/process.c
index 8109fbe8de4..a2dfc1bc3ee 100644
--- a/server/process.c
+++ b/server/process.c
@@ -34,9 +34,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 e4903bcb79f..b2a27fb9075 100644
--- a/server/queue.c
+++ b/server/queue.c
@@ -25,9 +25,7 @@
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.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 29b63600f15..5a952faf8aa 100644
--- a/server/request.c
+++ b/server/request.c
@@ -48,9 +48,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 bdc27de8e4f..19f5ca41ec6 100644
--- a/server/serial.c
+++ b/server/serial.c
@@ -42,9 +42,7 @@
#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 7b00cb3f4f4..59a009852c3 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 9d412106809..827d5737cb5 100644
--- a/server/thread.c
+++ b/server/thread.c
@@ -32,9 +32,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
--
2.23.0
More information about the wine-devel
mailing list