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 fa3aada3afb33d06348e486cea20f25f55bae876..1f9b8617340b91890ecc6a18ddfafa661c5974ef 100644 (file)
--- 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 1d87227b892c1e3fd5c27c8982390fa029b6fbd0..a725b78c654720e4e617ba7b97504a6471d511a5 100644 (file)
--- 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 a96efcecb387b61de7dd880ad5ea11d3351fdc90..bfa44adce3ee8b6a6dc6cdf4c02c498dae456c57 100644 (file)
--- 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 1eb3581fddf22ef20513421d797b7b53ea9f36a4..58738270e80c912b8fcbbc515eb8e1219ac089ad 100644 (file)
--- 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 2d10d7744b985cdc4867d2bc6609640c2d80b370..bbc39efa442e8c90a263df272dc598b69d0a67d6 100644 (file)
--- 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 3fa027b539edb77e5e7777de8489c6fd91214624..d10efdc2d6730fa3e72578878a53a978e419e2c7 100644 (file)
--- 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 715dffa0e58c9afc4cf24a355564d416c58e3ab9..109e0bb97f13d501dddac008631f3936a9331064 100644 (file)
--- 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 82a74d877a5d56ed5e7473a5e24d0f21f740ffae..34520223529e6022f450421dcb6b993e244f4606 100644 (file)
--- 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 884eccef5b676a09bdff840b1ce14877db6f170f..1cacdca188456f81ecbad1cd9684f18a23f4db21 100644 (file)
--- 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>