diff options
| author | Ian Campbell <ian.campbell@citrix.com> | 2012-05-14 17:15:36 +0100 |
|---|---|---|
| committer | Ian Campbell <ian.campbell@citrix.com> | 2012-05-14 17:15:36 +0100 |
| commit | debddaa56c84f5809774f34fdd190bc5f4a6cf16 (patch) | |
| tree | da59df5612d82de5a163d67c7f9e4b3d86d84fe3 /tools/console | |
| parent | 633979eeb74ecf9200a2f86eff9ed3f09c12bea9 (diff) | |
| download | xen-debddaa56c84f5809774f34fdd190bc5f4a6cf16.tar.gz xen-debddaa56c84f5809774f34fdd190bc5f4a6cf16.tar.bz2 xen-debddaa56c84f5809774f34fdd190bc5f4a6cf16.zip | |
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 <waldi@debian.org>
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
--HG--
rename : tools/xenstore/xs.h => tools/xenstore/xenstore.h
rename : tools/xenstore/xs_lib.h => tools/xenstore/xenstore_lib.h
Diffstat (limited to 'tools/console')
| -rw-r--r-- | tools/console/client/main.c | 2 | ||||
| -rw-r--r-- | tools/console/daemon/io.c | 2 | ||||
| -rw-r--r-- | tools/console/daemon/utils.h | 2 |
3 files changed, 3 insertions, 3 deletions
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 <sys/stropts.h> #endif -#include "xs.h" +#include <xenstore.h> #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 <xs.h> +#include <xenstore.h> #include <xen/io/console.h> #include <stdlib.h> 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 <stdio.h> #include <xenctrl.h> -#include "xs.h" +#include <xenstore.h> void daemonize(const char *pidfile); bool xen_setup(void); |