From debddaa56c84f5809774f34fdd190bc5f4a6cf16 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Mon, 14 May 2012 17:15:36 +0100 Subject: nstore: rename public xenstore headers The xenstore header xs.h is producing conflicts with other software[1]. xs is a too short identifier and does not matche the library. Renaming the headers to xenstore.h and xenstore_lib.h is the easiest way to make them easy recognizable and prevent furthe problems. [1]: http://bugs.debian.org/668550 [ Also update QEMU_TAG, to bring in corresponding change to qemu-xen-traditional. -iwj ] Signed-off-by: Bastian Blank Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --HG-- rename : tools/xenstore/xs.h => tools/xenstore/xenstore.h rename : tools/xenstore/xs_lib.h => tools/xenstore/xenstore_lib.h --- tools/console/client/main.c | 2 +- tools/console/daemon/io.c | 2 +- tools/console/daemon/utils.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'tools/console') diff --git a/tools/console/client/main.c b/tools/console/client/main.c index df3636fc20..523fc23ed5 100644 --- a/tools/console/client/main.c +++ b/tools/console/client/main.c @@ -39,7 +39,7 @@ #include #endif -#include "xs.h" +#include #include "xenctrl.h" #define ESCAPE_CHARACTER 0x1d diff --git a/tools/console/daemon/io.c b/tools/console/daemon/io.c index b6d41de99c..f09d63a304 100644 --- a/tools/console/daemon/io.c +++ b/tools/console/daemon/io.c @@ -22,7 +22,7 @@ #include "utils.h" #include "io.h" -#include +#include #include #include diff --git a/tools/console/daemon/utils.h b/tools/console/daemon/utils.h index 6743e5fdf6..8725dcdafa 100644 --- a/tools/console/daemon/utils.h +++ b/tools/console/daemon/utils.h @@ -26,7 +26,7 @@ #include #include -#include "xs.h" +#include void daemonize(const char *pidfile); bool xen_setup(void); -- cgit v1.2.3