| From 7dcf46969e85c881c901df4b49309e9091cad16a Mon Sep 17 00:00:00 2001 |
| From: Andre McCurdy <armccurdy@gmail.com> |
| Date: Tue, 9 Feb 2016 14:01:18 -0800 |
| Subject: [PATCH] avoid including <sys/poll.h> directly |
| |
| Fixes compiler warnings when building with musl libc. |
| |
| Upstream-Status: Pending |
| |
| Signed-off-by: Andre McCurdy <armccurdy@gmail.com> |
| --- |
| aserver/aserver.c | 2 +- |
| include/asoundlib-head.h | 2 +- |
| include/asoundlib.h | 2 +- |
| include/local.h | 2 +- |
| src/control/control.c | 2 +- |
| src/control/control_shm.c | 2 +- |
| src/pcm/pcm_direct.c | 2 +- |
| src/pcm/pcm_mmap.c | 2 +- |
| src/pcm/pcm_share.c | 2 +- |
| src/pcm/pcm_shm.c | 2 +- |
| src/seq/seq.c | 2 +- |
| src/shmarea.c | 2 +- |
| 12 files changed, 12 insertions(+), 12 deletions(-) |
| |
| diff --git a/aserver/aserver.c b/aserver/aserver.c |
| index 1579da7..ef64248 100644 |
| --- 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 1ec611e..21e32c6 100644 |
| --- 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/asoundlib.h b/include/asoundlib.h |
| index 3c2766e..a546194 100644 |
| --- a/include/asoundlib.h |
| +++ b/include/asoundlib.h |
| @@ -35,7 +35,7 @@ |
| #include <string.h> |
| #include <fcntl.h> |
| #include <assert.h> |
| -#include <sys/poll.h> |
| +#include <poll.h> |
| #include <errno.h> |
| #include <stdarg.h> |
| #include <endian.h> |
| diff --git a/include/local.h b/include/local.h |
| index b429f5d..e05898f 100644 |
| --- 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> |
| #include <linux/types.h> |
| diff --git a/src/control/control.c b/src/control/control.c |
| index 4a28cf6..071c5db 100644 |
| --- a/src/control/control.c |
| +++ b/src/control/control.c |
| @@ -48,7 +48,7 @@ and IEC958 structure. |
| #include <string.h> |
| #include <fcntl.h> |
| #include <signal.h> |
| -#include <sys/poll.h> |
| +#include <poll.h> |
| #include "control_local.h" |
| |
| /** |
| diff --git a/src/control/control_shm.c b/src/control/control_shm.c |
| index bd07d4a..9a2e268 100644 |
| --- 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_direct.c b/src/pcm/pcm_direct.c |
| index fd3877c..52ac093 100644 |
| --- 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 5c4fbe1..2cfa7db 100644 |
| --- 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 5d8aaf2..21a57fc 100644 |
| --- 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 a815ac6..4ee958c 100644 |
| --- 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 620ca3f..681cef1 100644 |
| --- 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 9843aa8..eaa71f0 100644 |
| --- 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" |
| -- |
| 1.9.1 |
| |