[vlc-devel] [PATCH] Check for <poll.h> explicitly
Rémi Denis-Courmont
remi at remlab.net
Sat Jun 6 15:48:00 CEST 2020
---
configure.ac | 4 ++--
modules/access/amt.c | 2 +-
modules/access/http/h2conn.c | 2 +-
modules/access/http/h2output.c | 2 +-
modules/access/mms/mmstu.c | 2 +-
modules/access/nfs.c | 2 +-
modules/access/rdp.c | 2 +-
modules/access/rist.c | 2 +-
modules/access/rtp/datagram.c | 2 +-
modules/access/rtp/input.c | 2 +-
modules/access/satip.c | 2 +-
modules/access/smb2.c | 2 +-
modules/access/udp.c | 2 +-
modules/access_output/rist.c | 2 +-
modules/control/lirc.c | 2 +-
modules/control/netsync.c | 2 +-
modules/lua/libs/net.c | 2 +-
modules/services_discovery/sap.c | 2 +-
modules/services_discovery/xcb_apps.c | 2 +-
modules/stream_out/chromecast/chromecast_communication.cpp | 2 +-
modules/video_output/xcb/window.c | 2 +-
src/misc/interrupt.c | 2 +-
src/network/httpd.c | 2 +-
src/network/io.c | 2 +-
src/network/stream.c | 2 +-
src/network/tls.c | 2 +-
26 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/configure.ac b/configure.ac
index 08e87df41c..090132f7ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -732,7 +732,7 @@ AH_BOTTOM([#include <vlc_fixups.h>])
dnl Check for struct pollfd
AC_CHECK_TYPES([struct pollfd],,,
[#include <sys/types.h>
-#if HAVE_POLL
+#if HAVE_POLL_H
# include <poll.h>
#elif defined (_WIN32)
# include <winsock2.h>
@@ -953,7 +953,7 @@ dnl Check for headers
dnl
dnl POSIX
-AC_CHECK_HEADERS([arpa/inet.h pthread.h search.h sys/shm.h sys/socket.h sys/uio.h])
+AC_CHECK_HEADERS([arpa/inet.h poll.h pthread.h search.h sys/shm.h sys/socket.h sys/uio.h])
AC_CHECK_HEADERS([net/if.h], [], [],
[
#include <sys/types.h>
diff --git a/modules/access/amt.c b/modules/access/amt.c
index 4f2f7793c4..52bf0271ef 100644
--- a/modules/access/amt.c
+++ b/modules/access/amt.c
@@ -58,7 +58,7 @@
#include <vlc_interrupt.h>
#include <vlc_url.h>
-#ifdef HAVE_POLL
+#ifdef HAVE_POLL_H
#include <poll.h>
#endif
#ifdef HAVE_SYS_UIO_H
diff --git a/modules/access/http/h2conn.c b/modules/access/http/h2conn.c
index 258a0c8da2..3b0e9d6d6e 100644
--- a/modules/access/http/h2conn.c
+++ b/modules/access/http/h2conn.c
@@ -26,7 +26,7 @@
#include <errno.h>
#include <inttypes.h>
#include <stdlib.h>
-#ifdef HAVE_POLL
+#ifdef HAVE_POLL_H
# include <poll.h>
#endif
#ifdef HAVE_SYS_UIO_H
diff --git a/modules/access/http/h2output.c b/modules/access/http/h2output.c
index 9d0df4cf75..74188ef29c 100644
--- a/modules/access/http/h2output.c
+++ b/modules/access/http/h2output.c
@@ -25,7 +25,7 @@
#include <assert.h>
#include <errno.h>
#include <stdlib.h>
-#ifdef HAVE_POLL
+#ifdef HAVE_POLL_H
# include <poll.h>
#endif
#ifdef HAVE_SYS_UIO_H
diff --git a/modules/access/mms/mmstu.c b/modules/access/mms/mmstu.c
index 4c0c5a62e6..c524b22816 100644
--- a/modules/access/mms/mmstu.c
+++ b/modules/access/mms/mmstu.c
@@ -36,7 +36,7 @@
#include <sys/types.h>
#include <unistd.h>
-#ifdef HAVE_POLL
+#ifdef HAVE_POLL_H
# include <poll.h>
#endif
diff --git a/modules/access/nfs.c b/modules/access/nfs.c
index 5f215aa177..e892219991 100644
--- a/modules/access/nfs.c
+++ b/modules/access/nfs.c
@@ -29,7 +29,7 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
-#ifdef HAVE_POLL
+#ifdef HAVE_POLL_H
# include <poll.h>
#endif
diff --git a/modules/access/rdp.c b/modules/access/rdp.c
index 12d85f99fb..b1a0fe0bdf 100644
--- a/modules/access/rdp.c
+++ b/modules/access/rdp.c
@@ -58,7 +58,7 @@
#endif
#include <errno.h>
-#ifdef HAVE_POLL
+#ifdef HAVE_POLL_H
# include <poll.h>
#endif
diff --git a/modules/access/rist.c b/modules/access/rist.c
index 35e9a27761..009c17790d 100644
--- a/modules/access/rist.c
+++ b/modules/access/rist.c
@@ -35,7 +35,7 @@
#include <vlc_network.h>
#include <vlc_block.h>
#include <vlc_url.h>
-#ifdef HAVE_POLL
+#ifdef HAVE_POLL_H
#include <poll.h>
#endif
#include <bitstream/ietf/rtcp_rr.h>
diff --git a/modules/access/rtp/datagram.c b/modules/access/rtp/datagram.c
index 55323a3a8a..3e87d5497a 100644
--- a/modules/access/rtp/datagram.c
+++ b/modules/access/rtp/datagram.c
@@ -24,7 +24,7 @@
#include <errno.h>
#include <stdlib.h>
-#ifdef HAVE_POLL
+#ifdef HAVE_POLL_H
#include <poll.h>
#endif
diff --git a/modules/access/rtp/input.c b/modules/access/rtp/input.c
index b05a6c9dae..d819fe5fff 100644
--- a/modules/access/rtp/input.c
+++ b/modules/access/rtp/input.c
@@ -26,7 +26,7 @@
#include <limits.h>
#include <errno.h>
-#ifdef HAVE_POLL
+#ifdef HAVE_POLL_H
# include <poll.h>
#endif
#ifdef HAVE_SYS_UIO_H
diff --git a/modules/access/satip.c b/modules/access/satip.c
index 47f8e3e7db..4bb4a563aa 100644
--- a/modules/access/satip.c
+++ b/modules/access/satip.c
@@ -41,7 +41,7 @@
#include <vlc_url.h>
#include <vlc_interrupt.h>
-#ifdef HAVE_POLL
+#ifdef HAVE_POLL_H
#include <poll.h>
#endif
#include <fcntl.h>
diff --git a/modules/access/smb2.c b/modules/access/smb2.c
index 5e73d3a7cc..531e93206d 100644
--- a/modules/access/smb2.c
+++ b/modules/access/smb2.c
@@ -29,7 +29,7 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
-#ifdef HAVE_POLL
+#ifdef HAVE_POLL_H
# include <poll.h>
#endif
diff --git a/modules/access/udp.c b/modules/access/udp.c
index a4946ef5a7..66f33b696d 100644
--- a/modules/access/udp.c
+++ b/modules/access/udp.c
@@ -41,7 +41,7 @@
#include <vlc_network.h>
#include <vlc_block.h>
#include <vlc_interrupt.h>
-#ifdef HAVE_POLL
+#ifdef HAVE_POLL_H
# include <poll.h>
#endif
#ifdef HAVE_SYS_UIO_H
diff --git a/modules/access_output/rist.c b/modules/access_output/rist.c
index c73a504455..61066bdc2b 100644
--- a/modules/access_output/rist.c
+++ b/modules/access_output/rist.c
@@ -36,7 +36,7 @@
#include <vlc_queue.h>
#include <vlc_threads.h>
#include <vlc_rand.h>
-#ifdef HAVE_POLL
+#ifdef HAVE_POLL_H
#include <poll.h>
#endif
#include <sys/time.h>
diff --git a/modules/control/lirc.c b/modules/control/lirc.c
index 3750b2e9df..818c4c9a3f 100644
--- a/modules/control/lirc.c
+++ b/modules/control/lirc.c
@@ -37,7 +37,7 @@
#include <vlc_interface.h>
#include <vlc_actions.h>
-#ifdef HAVE_POLL
+#ifdef HAVE_POLL_H
# include <poll.h>
#endif
diff --git a/modules/control/netsync.c b/modules/control/netsync.c
index 324174228f..4a75bc5bbd 100644
--- a/modules/control/netsync.c
+++ b/modules/control/netsync.c
@@ -37,7 +37,7 @@
#include <sys/types.h>
#include <unistd.h>
-#ifdef HAVE_POLL
+#ifdef HAVE_POLL_H
# include <poll.h>
#endif
diff --git a/modules/lua/libs/net.c b/modules/lua/libs/net.c
index 6680ac3103..9df5ffa48e 100644
--- a/modules/lua/libs/net.c
+++ b/modules/lua/libs/net.c
@@ -32,7 +32,7 @@
#ifdef _WIN32
#include <io.h>
#endif
-#ifdef HAVE_POLL
+#ifdef HAVE_POLL_H
#include <poll.h> /* poll structures and defines */
#endif
#include <sys/stat.h>
diff --git a/modules/services_discovery/sap.c b/modules/services_discovery/sap.c
index f161dac988..0bc85d85bc 100644
--- a/modules/services_discovery/sap.c
+++ b/modules/services_discovery/sap.c
@@ -45,7 +45,7 @@
#ifdef HAVE_ARPA_INET_H
# include <arpa/inet.h>
#endif
-#ifdef HAVE_POLL
+#ifdef HAVE_POLL_H
# include <poll.h>
#endif
diff --git a/modules/services_discovery/xcb_apps.c b/modules/services_discovery/xcb_apps.c
index e2742f660e..d22ea63933 100644
--- a/modules/services_discovery/xcb_apps.c
+++ b/modules/services_discovery/xcb_apps.c
@@ -35,7 +35,7 @@ typedef xcb_atom_t Atom;
#ifdef HAVE_SEARCH_H
# include <search.h>
#endif
-#ifdef HAVE_POLL
+#ifdef HAVE_POLL_H
# include <poll.h>
#endif
#ifdef _WIN32
diff --git a/modules/stream_out/chromecast/chromecast_communication.cpp b/modules/stream_out/chromecast/chromecast_communication.cpp
index b6ddd97571..347a15dbc6 100644
--- a/modules/stream_out/chromecast/chromecast_communication.cpp
+++ b/modules/stream_out/chromecast/chromecast_communication.cpp
@@ -28,7 +28,7 @@
#endif
#include "chromecast.h"
-#ifdef HAVE_POLL
+#ifdef HAVE_POLL_H
# include <poll.h>
#endif
diff --git a/modules/video_output/xcb/window.c b/modules/video_output/xcb/window.c
index a8116020c9..5e58d10ebf 100644
--- a/modules/video_output/xcb/window.c
+++ b/modules/video_output/xcb/window.c
@@ -26,7 +26,7 @@
#include <stdarg.h>
#include <assert.h>
-#ifdef HAVE_POLL
+#ifdef HAVE_POLL_H
# include <poll.h>
#endif
#include <unistd.h> /* gethostname() and sysconf() */
diff --git a/src/misc/interrupt.c b/src/misc/interrupt.c
index 2bd29b86b3..972c01ebf5 100644
--- a/src/misc/interrupt.c
+++ b/src/misc/interrupt.c
@@ -29,7 +29,7 @@
#include <stdbool.h>
#include <stdlib.h>
-#ifdef HAVE_POLL
+#ifdef HAVE_POLL_H
#include <poll.h>
#endif
#ifdef HAVE_SYS_EVENTFD_H
diff --git a/src/network/httpd.c b/src/network/httpd.c
index 610afb1e93..91bd864e1f 100644
--- a/src/network/httpd.c
+++ b/src/network/httpd.c
@@ -51,7 +51,7 @@
# include <sys/uio.h>
#endif
-#ifdef HAVE_POLL
+#ifdef HAVE_POLL_H
# include <poll.h>
#endif
diff --git a/src/network/io.c b/src/network/io.c
index 8499a5dd37..5b17e67f6b 100644
--- a/src/network/io.c
+++ b/src/network/io.c
@@ -38,7 +38,7 @@
#include <assert.h>
#include <unistd.h>
-#ifdef HAVE_POLL
+#ifdef HAVE_POLL_H
# include <poll.h>
#endif
#ifdef HAVE_LINUX_DCCP_H
diff --git a/src/network/stream.c b/src/network/stream.c
index 5c2ddac1a6..9d241e4f54 100644
--- a/src/network/stream.c
+++ b/src/network/stream.c
@@ -30,7 +30,7 @@
# include "config.h"
#endif
-#ifdef HAVE_POLL
+#ifdef HAVE_POLL_H
# include <poll.h>
#endif
#include <assert.h>
diff --git a/src/network/tls.c b/src/network/tls.c
index 2fde82d61a..9023e0496f 100644
--- a/src/network/tls.c
+++ b/src/network/tls.c
@@ -28,7 +28,7 @@
# include "config.h"
#endif
-#ifdef HAVE_POLL
+#ifdef HAVE_POLL_H
# include <poll.h>
#endif
#include <assert.h>
--
2.27.0
More information about the vlc-devel
mailing list