From 948955a2d6f8e4e28bceada9666c5831de4a6bb8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?St=C3=A9phane=20Graber?= Date: Sat, 21 Sep 2013 17:43:45 -0500 Subject: [PATCH] Consistently use for the API MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The API header was included in a variety of ways before, standardize those to "include " as this will always work both in tree and on a system with the headers installed. Signed-off-by: Stéphane Graber Acked-by: Serge Hallyn Signed-off-by: Serge Hallyn --- src/lxc/bdev.h | 2 +- src/lxc/console.c | 2 +- src/lxc/lxc_clone.c | 2 +- src/lxc/lxc_config.c | 2 +- src/lxc/lxc_console.c | 2 +- src/lxc/lxc_create.c | 2 +- src/lxc/lxc_destroy.c | 2 +- src/lxc/lxc_snapshot.c | 2 +- src/lxc/lxc_start.c | 2 +- src/lxc/lxccontainer.c | 2 +- src/tests/cgpath.c | 2 +- src/tests/clonetest.c | 2 +- src/tests/concurrent.c | 2 +- src/tests/console.c | 2 +- src/tests/containertests.c | 2 +- src/tests/createtest.c | 2 +- src/tests/destroytest.c | 2 +- src/tests/get_item.c | 2 +- src/tests/getkeys.c | 2 +- src/tests/lxcpath.c | 2 +- src/tests/saveconfig.c | 2 +- src/tests/shutdowntest.c | 2 +- src/tests/snapshot.c | 2 +- src/tests/startone.c | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/lxc/bdev.h b/src/lxc/bdev.h index f9d9a0cb3..a603d9e95 100644 --- a/src/lxc/bdev.h +++ b/src/lxc/bdev.h @@ -29,7 +29,7 @@ */ #include "config.h" -#include "lxccontainer.h" +#include struct bdev; diff --git a/src/lxc/console.c b/src/lxc/console.c index 78be4031d..d854dbb66 100644 --- a/src/lxc/console.c +++ b/src/lxc/console.c @@ -31,7 +31,7 @@ #include #include -#include "lxccontainer.h" +#include #include "log.h" #include "conf.h" #include "config.h" diff --git a/src/lxc/lxc_clone.c b/src/lxc/lxc_clone.c index 8b5c6e957..e0be9da3f 100644 --- a/src/lxc/lxc_clone.c +++ b/src/lxc/lxc_clone.c @@ -32,7 +32,7 @@ #include "lxc.h" #include "conf.h" #include "state.h" -#include "lxccontainer.h" +#include lxc_log_define(lxc_clone, lxc); diff --git a/src/lxc/lxc_config.c b/src/lxc/lxc_config.c index b3f2ed897..c90be7dca 100644 --- a/src/lxc/lxc_config.c +++ b/src/lxc/lxc_config.c @@ -20,7 +20,7 @@ #include #include "config.h" -#include "lxccontainer.h" +#include struct lxc_config_items { char *name; diff --git a/src/lxc/lxc_console.c b/src/lxc/lxc_console.c index 28ad77244..ea1e9993f 100644 --- a/src/lxc/lxc_console.c +++ b/src/lxc/lxc_console.c @@ -38,7 +38,7 @@ #include #include -#include "../lxc/lxccontainer.h" +#include #include "error.h" #include "lxc.h" #include "log.h" diff --git a/src/lxc/lxc_create.c b/src/lxc/lxc_create.c index 4f205e8ae..f577e3005 100644 --- a/src/lxc/lxc_create.c +++ b/src/lxc/lxc_create.c @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "../lxc/lxccontainer.h" +#include #include #include diff --git a/src/lxc/lxc_destroy.c b/src/lxc/lxc_destroy.c index 0724eb808..a1f73ca83 100644 --- a/src/lxc/lxc_destroy.c +++ b/src/lxc/lxc_destroy.c @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "../lxc/lxccontainer.h" +#include #include #include diff --git a/src/lxc/lxc_snapshot.c b/src/lxc/lxc_snapshot.c index 0177f5dd8..c21563f60 100644 --- a/src/lxc/lxc_snapshot.c +++ b/src/lxc/lxc_snapshot.c @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "../lxc/lxccontainer.h" +#include #include #include diff --git a/src/lxc/lxc_start.c b/src/lxc/lxc_start.c index a30a9f683..a894513bc 100644 --- a/src/lxc/lxc_start.c +++ b/src/lxc/lxc_start.c @@ -43,7 +43,7 @@ #include "log.h" #include "caps.h" #include "lxc.h" -#include "lxccontainer.h" +#include #include "conf.h" #include "cgroup.h" #include "utils.h" diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c index 5c49b8bfe..ea5a84efc 100644 --- a/src/lxc/lxccontainer.c +++ b/src/lxc/lxccontainer.c @@ -31,7 +31,7 @@ #include "config.h" #include "lxc.h" #include "state.h" -#include "lxccontainer.h" +#include #include "conf.h" #include "confile.h" #include "console.h" diff --git a/src/tests/cgpath.c b/src/tests/cgpath.c index f9aaced74..26a79c390 100644 --- a/src/tests/cgpath.c +++ b/src/tests/cgpath.c @@ -16,7 +16,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "../lxc/lxccontainer.h" +#include #include #include diff --git a/src/tests/clonetest.c b/src/tests/clonetest.c index da3ce7526..b04ab3c6b 100644 --- a/src/tests/clonetest.c +++ b/src/tests/clonetest.c @@ -16,7 +16,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "../lxc/lxccontainer.h" +#include #include #include diff --git a/src/tests/concurrent.c b/src/tests/concurrent.c index c8a136803..6673f3aa8 100644 --- a/src/tests/concurrent.c +++ b/src/tests/concurrent.c @@ -23,7 +23,7 @@ #define _GNU_SOURCE #include -#include "../lxc/lxccontainer.h" +#include static int nthreads = 5; static int iterations = 1; diff --git a/src/tests/console.c b/src/tests/console.c index cd6398109..33d6ad278 100644 --- a/src/tests/console.c +++ b/src/tests/console.c @@ -19,7 +19,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "../lxc/lxccontainer.h" +#include #include #include diff --git a/src/tests/containertests.c b/src/tests/containertests.c index 8d1658fab..e463e352e 100644 --- a/src/tests/containertests.c +++ b/src/tests/containertests.c @@ -16,7 +16,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "../lxc/lxccontainer.h" +#include #include #include diff --git a/src/tests/createtest.c b/src/tests/createtest.c index 879d0a122..c018458b4 100644 --- a/src/tests/createtest.c +++ b/src/tests/createtest.c @@ -16,7 +16,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "../lxc/lxccontainer.h" +#include #include #include diff --git a/src/tests/destroytest.c b/src/tests/destroytest.c index 428d09ef1..6403472f3 100644 --- a/src/tests/destroytest.c +++ b/src/tests/destroytest.c @@ -16,7 +16,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "../lxc/lxccontainer.h" +#include #include #include diff --git a/src/tests/get_item.c b/src/tests/get_item.c index c4c95cbd4..9475130ad 100644 --- a/src/tests/get_item.c +++ b/src/tests/get_item.c @@ -16,7 +16,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "../lxc/lxccontainer.h" +#include #include #include diff --git a/src/tests/getkeys.c b/src/tests/getkeys.c index bab68830d..f90f009d6 100644 --- a/src/tests/getkeys.c +++ b/src/tests/getkeys.c @@ -16,7 +16,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "../lxc/lxccontainer.h" +#include #include #include diff --git a/src/tests/lxcpath.c b/src/tests/lxcpath.c index a849a38e2..9a51d76a9 100644 --- a/src/tests/lxcpath.c +++ b/src/tests/lxcpath.c @@ -16,7 +16,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "../lxc/lxccontainer.h" +#include #include #include diff --git a/src/tests/saveconfig.c b/src/tests/saveconfig.c index 649573f60..a6eae650a 100644 --- a/src/tests/saveconfig.c +++ b/src/tests/saveconfig.c @@ -16,7 +16,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "../lxc/lxccontainer.h" +#include #include #include diff --git a/src/tests/shutdowntest.c b/src/tests/shutdowntest.c index f67995e1d..c7070c16c 100644 --- a/src/tests/shutdowntest.c +++ b/src/tests/shutdowntest.c @@ -17,7 +17,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "../lxc/lxccontainer.h" +#include #include #include diff --git a/src/tests/snapshot.c b/src/tests/snapshot.c index 1bbd6b414..8f165486d 100644 --- a/src/tests/snapshot.c +++ b/src/tests/snapshot.c @@ -16,7 +16,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "../lxc/lxccontainer.h" +#include #include #include diff --git a/src/tests/startone.c b/src/tests/startone.c index d781e758b..31ef50303 100644 --- a/src/tests/startone.c +++ b/src/tests/startone.c @@ -16,7 +16,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "../lxc/lxccontainer.h" +#include #include #include -- 2.47.3