Include poll.h instead of sys/poll.h

poll.h is defined in POSIX: http://pubs.opengroup.org/onlinepubs/009695399/functions/poll.html This fixes a compile warning when building with musl libc: In file included from start.c:46:0: /usr/include/sys/poll.h:1:2: error: #warning redirecting incorrect #include <sys /poll.h> to <poll.h> [-Werror=cpp] #warning redirecting incorrect #include <sys/poll.h> to <poll.h> ^ Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>

Include poll.h instead of sys/poll.h
37515ebd · Natanael Copa · Stéphane Graber · 565e571c · 37515ebd · 37515ebd
Commit 37515ebd authored Jan 29, 2014 by Natanael Copa Committed by Stéphane Graber Jan 29, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

commands.c src/lxc/commands.c +1 -1

lxc_console.c src/lxc/lxc_console.c +1 -1

start.c src/lxc/start.c +1 -1

No files found.
--- a/src/lxc/commands.c
+++ b/src/lxc/commands.c
@@ -26,9 +26,9 @@
 #include <unistd.h>
 #include <signal.h>
 #include <fcntl.h>
+#include <poll.h>
 #include <sys/socket.h>
 #include <sys/un.h>
-#include <sys/poll.h>
 #include <sys/param.h>
 #include <malloc.h>
 #include <stdlib.h>

--- a/src/lxc/lxc_console.c
+++ b/src/lxc/lxc_console.c
@@ -32,10 +32,10 @@
 #include <unistd.h>
 #include <signal.h>
 #include <libgen.h>
+#include <poll.h>
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <sys/poll.h>
 #include <sys/ioctl.h>
 #include <lxc/lxccontainer.h>

--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -33,6 +33,7 @@
 #include <signal.h>
 #include <fcntl.h>
 #include <termios.h>
+#include <poll.h>
 #include <sys/param.h>
 #include <sys/file.h>
 #include <sys/mount.h>
@@ -43,7 +44,6 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/un.h>
-#include <sys/poll.h>
 #include <sys/syscall.h>
 #if HAVE_SYS_CAPABILITY_H