From: Stéphane Graber <stgraber@ubuntu.com>
Date: Thu, 20 Dec 2012 13:17:09 +0000 (+0100)
Subject: Add/remove extra includes
X-Git-Tag: lxc-0.9.0.alpha3~1^2~64
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8173e600ef80d3f3685a6f1f933ab92f09a160c9;p=thirdparty%2Flxc.git

Add/remove extra includes

While cross-building with bionic, a number of failures were triggered by some
missing includes and in a few cases by extra unused includes.

This commit updates the various headers based on those observations.

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
---

diff --git a/src/lxc/conf.h b/src/lxc/conf.h
index fa3aada3a..1f9b86173 100644
--- a/src/lxc/conf.h
+++ b/src/lxc/conf.h
@@ -26,6 +26,7 @@
 #include <netinet/in.h>
 #include <net/if.h>
 #include <sys/param.h>
+#include <sys/types.h>
 #include <stdbool.h>
 
 #include <lxc/list.h>
diff --git a/src/lxc/confile.c b/src/lxc/confile.c
index 1d87227b8..a725b78c6 100644
--- a/src/lxc/confile.c
+++ b/src/lxc/confile.c
@@ -27,7 +27,6 @@
 #include <unistd.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <pty.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/src/lxc/confile.h b/src/lxc/confile.h
index a96efcecb..bfa44adce 100644
--- a/src/lxc/confile.h
+++ b/src/lxc/confile.h
@@ -21,6 +21,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
+#include <stdio.h>
+
 #ifndef _confile_h
 #define _confile_h
 
diff --git a/src/lxc/console.c b/src/lxc/console.c
index 1eb3581fd..58738270e 100644
--- a/src/lxc/console.c
+++ b/src/lxc/console.c
@@ -28,7 +28,7 @@
 #include <errno.h>
 #include <pty.h>
 #include <sys/types.h>
-#include <sys/un.h>
+#include <termios.h>
 
 #include "log.h"
 #include "conf.h"
diff --git a/src/lxc/lxclock.c b/src/lxc/lxclock.c
index 2d10d7744..bbc39efa4 100644
--- a/src/lxc/lxclock.c
+++ b/src/lxc/lxclock.c
@@ -19,6 +19,7 @@
 
 #include "lxclock.h"
 #include <malloc.h>
+#include <stdio.h>
 
 #define OFLAG (O_CREAT | O_RDWR)
 #define SEMMODE 0660
diff --git a/src/lxc/namespace.c b/src/lxc/namespace.c
index 3fa027b53..d10efdc2d 100644
--- a/src/lxc/namespace.c
+++ b/src/lxc/namespace.c
@@ -25,7 +25,6 @@
 #include <alloca.h>
 #include <errno.h>
 #include <signal.h>
-#include <syscall.h>
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/lxc/namespace.h b/src/lxc/namespace.h
index 715dffa0e..109e0bb97 100644
--- a/src/lxc/namespace.h
+++ b/src/lxc/namespace.h
@@ -23,7 +23,7 @@
 #ifndef __namespace_h
 #define __namespace_h
 
-#include <syscall.h>
+#include <sys/syscall.h>
 #include <sched.h>
 
 #ifndef CLONE_FS
diff --git a/src/lxc/start.c b/src/lxc/start.c
index 82a74d877..345202235 100644
--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -38,12 +38,14 @@
 #include <sys/mount.h>
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <sys/socket.h>
 #include <sys/prctl.h>
 #include <sys/types.h>
 #include <sys/capability.h>
 #include <sys/wait.h>
 #include <sys/un.h>
 #include <sys/poll.h>
+#include <sys/syscall.h>
 
 #ifdef HAVE_SYS_SIGNALFD_H
 #  include <sys/signalfd.h>
@@ -128,6 +130,7 @@ int signalfd(int fd, const sigset_t *mask, int flags)
 #include "namespace.h"
 #include "apparmor.h"
 #include "lxcseccomp.h"
+#include "caps.h"
 
 lxc_log_define(lxc_start, lxc);
 
diff --git a/src/lxc/stop.c b/src/lxc/stop.c
index 884eccef5..1cacdca18 100644
--- a/src/lxc/stop.c
+++ b/src/lxc/stop.c
@@ -26,7 +26,7 @@
 #include <errno.h>
 #include <unistd.h>
 #include <sys/param.h>
-#include <sys/signal.h>
+#include <signal.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/socket.h>