Gitiles
Code Review Sign In
gerrit.openbmc.org / stefanberger / openbmc / d8c66bc71e9a0303f1d300b9fa59c60dbfe10056 / . / yocto-poky / meta / recipes-multimedia / alsa / alsa-lib / avoid-including-sys-poll.h-directly.patch
blob: 161619b2791bfc811e4aa5969e13ce59fc8ef5e6 [file] [log] [blame]
Patrick Williamsd8c66bc2016-06-20 12:57:21 -0500[diff] [blame^]1From 7dcf46969e85c881c901df4b49309e9091cad16a Mon Sep 17 00:00:00 2001
2From: Andre McCurdy <armccurdy@gmail.com>
3Date: Tue, 9 Feb 2016 14:01:18 -0800
4Subject: [PATCH] avoid including <sys/poll.h> directly
5
6Fixes compiler warnings when building with musl libc.
7
8Upstream-Status: Pending
9
10Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
11---
12 aserver/aserver.c | 2 +-
13 include/asoundlib-head.h | 2 +-
14 include/asoundlib.h | 2 +-
15 include/local.h | 2 +-
16 src/control/control.c | 2 +-
17 src/control/control_shm.c | 2 +-
18 src/pcm/pcm_direct.c | 2 +-
19 src/pcm/pcm_mmap.c | 2 +-
20 src/pcm/pcm_share.c | 2 +-
21 src/pcm/pcm_shm.c | 2 +-
22 src/seq/seq.c | 2 +-
23 src/shmarea.c | 2 +-
24 12 files changed, 12 insertions(+), 12 deletions(-)
25
26diff --git a/aserver/aserver.c b/aserver/aserver.c
27index 1579da7..ef64248 100644
28--- a/aserver/aserver.c
29+++ b/aserver/aserver.c
30@@ -20,7 +20,7 @@
31
32 #include <sys/shm.h>
33 #include <sys/socket.h>
34-#include <sys/poll.h>
35+#include <poll.h>
36 #include <sys/un.h>
37 #include <sys/uio.h>
38 #include <stdio.h>
39diff --git a/include/asoundlib-head.h b/include/asoundlib-head.h
40index 1ec611e..21e32c6 100644
41--- a/include/asoundlib-head.h
42+++ b/include/asoundlib-head.h
43@@ -35,6 +35,6 @@
44 #include <string.h>
45 #include <fcntl.h>
46 #include <assert.h>
47-#include <sys/poll.h>
48+#include <poll.h>
49 #include <errno.h>
50 #include <stdarg.h>
51diff --git a/include/asoundlib.h b/include/asoundlib.h
52index 3c2766e..a546194 100644
53--- a/include/asoundlib.h
54+++ b/include/asoundlib.h
55@@ -35,7 +35,7 @@
56 #include <string.h>
57 #include <fcntl.h>
58 #include <assert.h>
59-#include <sys/poll.h>
60+#include <poll.h>
61 #include <errno.h>
62 #include <stdarg.h>
63 #include <endian.h>
64diff --git a/include/local.h b/include/local.h
65index b429f5d..e05898f 100644
66--- a/include/local.h
67+++ b/include/local.h
68@@ -47,7 +47,7 @@
69 #error Header defining endianness not defined
70 #endif
71 #include <stdarg.h>
72-#include <sys/poll.h>
73+#include <poll.h>
74 #include <sys/types.h>
75 #include <errno.h>
76 #include <linux/types.h>
77diff --git a/src/control/control.c b/src/control/control.c
78index 4a28cf6..071c5db 100644
79--- a/src/control/control.c
80+++ b/src/control/control.c
81@@ -48,7 +48,7 @@ and IEC958 structure.
82 #include <string.h>
83 #include <fcntl.h>
84 #include <signal.h>
85-#include <sys/poll.h>
86+#include <poll.h>
87 #include "control_local.h"
88
89 /**
90diff --git a/src/control/control_shm.c b/src/control/control_shm.c
91index bd07d4a..9a2e268 100644
92--- a/src/control/control_shm.c
93+++ b/src/control/control_shm.c
94@@ -27,7 +27,7 @@
95 #include <fcntl.h>
96 #include <sys/shm.h>
97 #include <sys/socket.h>
98-#include <sys/poll.h>
99+#include <poll.h>
100 #include <sys/un.h>
101 #include <sys/uio.h>
102 #include <sys/mman.h>
103diff --git a/src/pcm/pcm_direct.c b/src/pcm/pcm_direct.c
104index fd3877c..52ac093 100644
105--- a/src/pcm/pcm_direct.c
106+++ b/src/pcm/pcm_direct.c
107@@ -30,7 +30,7 @@
108 #include <grp.h>
109 #include <sys/ioctl.h>
110 #include <sys/mman.h>
111-#include <sys/poll.h>
112+#include <poll.h>
113 #include <sys/shm.h>
114 #include <sys/sem.h>
115 #include <sys/wait.h>
116diff --git a/src/pcm/pcm_mmap.c b/src/pcm/pcm_mmap.c
117index 5c4fbe1..2cfa7db 100644
118--- a/src/pcm/pcm_mmap.c
119+++ b/src/pcm/pcm_mmap.c
120@@ -22,7 +22,7 @@
121 #include <stdio.h>
122 #include <malloc.h>
123 #include <string.h>
124-#include <sys/poll.h>
125+#include <poll.h>
126 #include <sys/mman.h>
127 #ifdef HAVE_SYS_SHM_H
128 #include <sys/shm.h>
129diff --git a/src/pcm/pcm_share.c b/src/pcm/pcm_share.c
130index 5d8aaf2..21a57fc 100644
131--- a/src/pcm/pcm_share.c
132+++ b/src/pcm/pcm_share.c
133@@ -34,7 +34,7 @@
134 #include <signal.h>
135 #include <math.h>
136 #include <sys/socket.h>
137-#include <sys/poll.h>
138+#include <poll.h>
139 #include <pthread.h>
140 #include "pcm_local.h"
141
142diff --git a/src/pcm/pcm_shm.c b/src/pcm/pcm_shm.c
143index a815ac6..4ee958c 100644
144--- a/src/pcm/pcm_shm.c
145+++ b/src/pcm/pcm_shm.c
146@@ -36,7 +36,7 @@
147 #include <sys/ioctl.h>
148 #include <sys/shm.h>
149 #include <sys/socket.h>
150-#include <sys/poll.h>
151+#include <poll.h>
152 #include <sys/un.h>
153 #include <sys/mman.h>
154 #include <netinet/in.h>
155diff --git a/src/seq/seq.c b/src/seq/seq.c
156index 620ca3f..681cef1 100644
157--- a/src/seq/seq.c
158+++ b/src/seq/seq.c
159@@ -777,7 +777,7 @@ void event_filter(snd_seq_t *seq, snd_seq_event_t *ev)
160
161 */
162
163-#include <sys/poll.h>
164+#include <poll.h>
165 #include "seq_local.h"
166
167 /****************************************************************************
168diff --git a/src/shmarea.c b/src/shmarea.c
169index 9843aa8..eaa71f0 100644
170--- a/src/shmarea.c
171+++ b/src/shmarea.c
172@@ -27,7 +27,7 @@
173 #include <malloc.h>
174 #include <string.h>
175 #include <errno.h>
176-#include <sys/poll.h>
177+#include <poll.h>
178 #include <sys/mman.h>
179 #include <sys/shm.h>
180 #include "list.h"
181--
1821.9.1
183