[lxc-devel] [PATCH 1/8] Include poll.h instead of sys/poll.h
Natanael Copa
ncopa at alpinelinux.org
Wed Jan 29 14:23:43 UTC 2014
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 at alpinelinux.org>
---
src/lxc/commands.c | 2 +-
src/lxc/lxc_console.c | 2 +-
src/lxc/start.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/lxc/commands.c b/src/lxc/commands.c
index 8b42c59..1fca13e 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 e6a5a7e..03aa158 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 6de7a83..5808c89 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
--
1.8.5.3
More information about the lxc-devel
mailing list