cleanup: fix poll.h includes

According POSIX[1] and linux manpage[2] the include is poll.h, not
sys/poll.h.

This fixes the he following compiler warning when build with musl libc:

  /usr/include/sys/poll.h:1:2: warning: #warning redirecting incorrect #include <sys/poll.h> to <poll.h> [-Wcpp]
   #warning redirecting incorrect #include <sys/poll.h> to <poll.h>
    ^~~~~~~

Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/aserver/aserver.c b/aserver/aserver.c
index ac20706b9e0bf95a82c4d1d67a7f28d883c2813a..46f731a43be3e0705df6b6554dd4cba621486388 100644 (file)
--- a/aserver/aserver.c
+++ b/aserver/aserver.c
@@ -20,7 +20,7 @@
 
 #include <sys/shm.h>
 #include <sys/socket.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/un.h>
 #include <sys/uio.h>
 #include <stdio.h>

diff --git a/include/asoundlib-head.h b/include/asoundlib-head.h
index 1ec611e56b8e75375d097cc273772ecca5dbad05..21e32c6b246913486a5e1088f3b32d4d591413ba 100644 (file)
--- a/include/asoundlib-head.h
+++ b/include/asoundlib-head.h
@@ -35,6 +35,6 @@
 #include <string.h>
 #include <fcntl.h>
 #include <assert.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <errno.h>
 #include <stdarg.h>

diff --git a/include/local.h b/include/local.h
index 317f2e3209489dbee109329fdd859b9c956164d6..6a43a473a1febc8f8391e1860f7342f75f9e4d97 100644 (file)
--- a/include/local.h
+++ b/include/local.h
@@ -47,7 +47,7 @@
 #error Header defining endianness not defined
 #endif
 #include <stdarg.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/types.h>
 #include <errno.h>
 #if defined(__linux__)

diff --git a/src/control/control.c b/src/control/control.c
index 134ba4c8ebea40dc088a4d94db7f8119703e4cc1..6439b2949af0cbb477cd90c8acf51af9e0171f6c 100644 (file)
--- a/src/control/control.c
+++ b/src/control/control.c
@@ -90,7 +90,7 @@ against the original design.
 #include <string.h>
 #include <fcntl.h>
 #include <signal.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <stdbool.h>
 #include "control_local.h"
 

diff --git a/src/control/control_shm.c b/src/control/control_shm.c
index bd07d4af503aeafd826d9a009280f8c4085f47ed..9a2e268b1193d44e85caa4dfadf125ec344aa322 100644 (file)
--- a/src/control/control_shm.c
+++ b/src/control/control_shm.c
@@ -27,7 +27,7 @@
 #include <fcntl.h>
 #include <sys/shm.h>
 #include <sys/socket.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/un.h>
 #include <sys/uio.h>
 #include <sys/mman.h>

diff --git a/src/pcm/pcm.c b/src/pcm/pcm.c
index 200b10c2c09c24acae1cedf916235da4449a9936..2b4ce8ec7ac627599028b4ec4038f081681bfd5f 100644 (file)
--- a/src/pcm/pcm.c
+++ b/src/pcm/pcm.c
@@ -651,7 +651,7 @@ playback devices.
 #include <stdarg.h>
 #include <signal.h>
 #include <ctype.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/mman.h>
 #include <limits.h>
 #include "pcm_local.h"

diff --git a/src/pcm/pcm_direct.c b/src/pcm/pcm_direct.c
index 9fd376d8aa603fd1beec93ac5dadabb77c3df5b8..393083f5a7cf0d8581baf9cc874c70e50bb45e7c 100644 (file)
--- a/src/pcm/pcm_direct.c
+++ b/src/pcm/pcm_direct.c
@@ -30,7 +30,7 @@
 #include <grp.h>
 #include <sys/ioctl.h>
 #include <sys/mman.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/shm.h>
 #include <sys/sem.h>
 #include <sys/wait.h>

diff --git a/src/pcm/pcm_mmap.c b/src/pcm/pcm_mmap.c
index 1948289cdc4400e05780cb7fccb4296ca7d3587e..4cf220a41a7b7be37ce8bbaa6ecb5bb387689ab1 100644 (file)
--- a/src/pcm/pcm_mmap.c
+++ b/src/pcm/pcm_mmap.c
@@ -22,7 +22,7 @@
 #include <stdio.h>
 #include <malloc.h>
 #include <string.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/mman.h>
 #ifdef HAVE_SYS_SHM_H
 #include <sys/shm.h>

diff --git a/src/pcm/pcm_share.c b/src/pcm/pcm_share.c
index 5d8aaf215f220b70da62348839a9baabdf0a1f6f..21a57fc62d35cbfa37511cb1531ccfc98b2d6035 100644 (file)
--- a/src/pcm/pcm_share.c
+++ b/src/pcm/pcm_share.c
@@ -34,7 +34,7 @@
 #include <signal.h>
 #include <math.h>
 #include <sys/socket.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <pthread.h>
 #include "pcm_local.h"
 

diff --git a/src/pcm/pcm_shm.c b/src/pcm/pcm_shm.c
index a815ac6b4b83c9d5365191194b0666bf0dcd0b73..4ee958c1072d9328468cb143a94112865a4a9dce 100644 (file)
--- a/src/pcm/pcm_shm.c
+++ b/src/pcm/pcm_shm.c
@@ -36,7 +36,7 @@
 #include <sys/ioctl.h>
 #include <sys/shm.h>
 #include <sys/socket.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/un.h>
 #include <sys/mman.h>
 #include <netinet/in.h>

diff --git a/src/seq/seq.c b/src/seq/seq.c
index b206e2f804df2ead31389f0da89023ab069bf43b..d5ed1c6a4a21b696a0523a63dcc758200a47bd88 100644 (file)
--- a/src/seq/seq.c
+++ b/src/seq/seq.c
@@ -777,7 +777,7 @@ void event_filter(snd_seq_t *seq, snd_seq_event_t *ev)
 
 */
 
-#include <sys/poll.h>
+#include <poll.h>
 #include "seq_local.h"
 
 /****************************************************************************

diff --git a/src/shmarea.c b/src/shmarea.c
index 9843aa8b4f7e08384fd44ced48692053fb49d9c5..eaa71f00f6fc12c4a279950d8dd9d05400c083c4 100644 (file)
--- a/src/shmarea.c
+++ b/src/shmarea.c
@@ -27,7 +27,7 @@
 #include <malloc.h>
 #include <string.h>
 #include <errno.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/mman.h>
 #include <sys/shm.h>
 #include "list.h"