lxc: fix erroneous includes

The "" notation is preferrable if the header file is local.

Signed-off-by: Greg Kurz <gkurz@fr.ibm.com>
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>

diff --git a/src/lxc/genl.c b/src/lxc/genl.c
index 3781be1541f7fa61734e4ee4495cec022f5cbe4c..43959ce9a7722611660a4e6989ed39c66f674a5a 100644 (file)
--- a/src/lxc/genl.c
+++ b/src/lxc/genl.c
@@ -28,8 +28,9 @@
 #include <unistd.h>
 #include <linux/genetlink.h>
 #include <linux/rtnetlink.h>
-#include <nl.h>
-#include <genl.h>
+
+#include "nl.h"
+#include "genl.h"
 
 static int genetlink_resolve_family(const char *family)
 {

diff --git a/src/lxc/lxc_info.c b/src/lxc/lxc_info.c
index 74b6b590b95550c57b41a5331914e81d3cea932e..809769e4d9aa4aa3d274f7238f3e7e8478708e62 100644 (file)
--- a/src/lxc/lxc_info.c
+++ b/src/lxc/lxc_info.c
@@ -28,7 +28,8 @@
 
 #include <lxc/lxc.h>
 #include <lxc/log.h>
-#include <commands.h>
+
+#include "commands.h"
 #include "arguments.h"
 
 static bool state;

diff --git a/src/lxc/mainloop.h b/src/lxc/mainloop.h
index deeff2310985073af4a8a68931700169d5179fa7..09e50332b6b1a17500d3a262d4909c54eeddef83 100644 (file)
--- a/src/lxc/mainloop.h
+++ b/src/lxc/mainloop.h
@@ -21,7 +21,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include <list.h>
+#include "list.h"
 
 struct lxc_epoll_descr {
        int epfd;

diff --git a/src/lxc/network.c b/src/lxc/network.c
index 5110ca73bcc812b6563866f943c8c65b7210fb27..214460b81031df96e172171eee7ec105a3f4d02d 100644 (file)
--- a/src/lxc/network.c
+++ b/src/lxc/network.c
@@ -44,8 +44,9 @@
 #include <linux/rtnetlink.h>
 #include <linux/sockios.h>
 #include <linux/if_bridge.h>
-#include <nl.h>
-#include <network.h>
+
+#include "nl.h"
+#include "network.h"
 
 #ifndef IFLA_LINKMODE
 #  define IFLA_LINKMODE 17

diff --git a/src/lxc/nl.c b/src/lxc/nl.c
index 236cfcb27f64e46aef480a35a6644767f71e97ba..6294442ec2f31f8c2cf5da73e47496522efd200d 100644 (file)
--- a/src/lxc/nl.c
+++ b/src/lxc/nl.c
@@ -29,7 +29,8 @@
 #include <stdlib.h>
 #include <linux/netlink.h>
 #include <linux/rtnetlink.h>
-#include <nl.h>
+
+#include "nl.h"
 
 #define NLMSG_TAIL(nmsg) \
         ((struct rtattr *) (((void *) (nmsg)) + NLMSG_ALIGN((nmsg)->nlmsg_len)))

diff --git a/src/lxc/restart.c b/src/lxc/restart.c
index c947b81337ee5a765105e088d66284a5aa4b92f9..a19b94820ba86e3e1b61c479694602a11ad68953 100644 (file)
--- a/src/lxc/restart.c
+++ b/src/lxc/restart.c
@@ -21,7 +21,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "../config.h"
+#include "config.h"
+
 #include <stdio.h>
 #undef _GNU_SOURCE
 #include <string.h>

diff --git a/src/lxc/rtnl.c b/src/lxc/rtnl.c
index bc235428764e6685034c824ece719faf701726d7..ec1eff2acaea57720aee71628a5f2f84e61fa691 100644 (file)
--- a/src/lxc/rtnl.c
+++ b/src/lxc/rtnl.c
@@ -28,8 +28,9 @@
 #include <unistd.h>
 #include <linux/netlink.h>
 #include <linux/rtnetlink.h>
-#include <nl.h>
-#include <rtnl.h>
+
+#include "nl.h"
+#include "rtnl.h"
 
 extern int rtnetlink_open(struct rtnl_handler *handler)
 {

diff --git a/src/lxc/start.c b/src/lxc/start.c
index 9481a8ab0e0fc0218d38e93e40ef09eff2d60b34..334262d7ea91d1c04ab5f155449672b694a8db16 100644 (file)
--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -21,7 +21,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "../config.h"
+#include "config.h"
+
 #include <stdio.h>
 #undef _GNU_SOURCE
 #include <string.h>
@@ -32,7 +33,6 @@
 #include <signal.h>
 #include <fcntl.h>
 #include <termios.h>
-#include <namespace.h>
 #include <sys/param.h>
 #include <sys/file.h>
 #include <sys/mount.h>
@@ -125,6 +125,7 @@ int signalfd(int fd, const sigset_t *mask, int flags)
 #include "commands.h"
 #include "console.h"
 #include "sync.h"
+#include "namespace.h"
 
 lxc_log_define(lxc_start, lxc);