From: Natanael Copa <ncopa@alpinelinux.org>
Date: Wed, 29 Jan 2014 14:23:43 +0000 (+0000)
Subject: Include poll.h instead of sys/poll.h
X-Git-Tag: lxc-1.0.0.beta4~54
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=37515ebdf0d75c018513d55b0fe172df3d1a3c46;p=thirdparty%2Flxc.git

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>
---

diff --git a/src/lxc/commands.c b/src/lxc/commands.c
index 8b42c5939..1fca13efb 100644
--- 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>
diff --git a/src/lxc/lxc_console.c b/src/lxc/lxc_console.c
index e6a5a7ea2..03aa15848 100644
--- 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>
diff --git a/src/lxc/start.c b/src/lxc/start.c
index 6de7a8317..5808c89cf 100644
--- 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