From: Ian Campbell <ian.campbell@citrix.com>
Date: Mon, 14 May 2012 16:15:36 +0000 (+0100)
Subject: nstore: rename public xenstore headers
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=5d9301f34df8fc4346696a70a335cf8c87ceaf1e;p=people%2Fliuw%2Flibxenctrl-split%2Fmini-os.git

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
---

diff --git a/lib/sys.c b/lib/sys.c
index 5875797..a7d35d6 100644
--- a/lib/sys.c
+++ b/lib/sys.c
@@ -28,7 +28,7 @@
 #include <blkfront.h>
 #include <fbfront.h>
 #include <xenbus.h>
-#include <xs.h>
+#include <xenstore.h>
 
 #include <sys/types.h>
 #include <sys/unistd.h>
diff --git a/lib/xs.c b/lib/xs.c
index 6eced70..a2a1220 100644
--- a/lib/xs.c
+++ b/lib/xs.c
@@ -9,7 +9,7 @@
 #ifdef HAVE_LIBC
 #include <os.h>
 #include <lib.h>
-#include <xs.h>
+#include <xenstore.h>
 #include <xenbus.h>
 #include <stdlib.h>
 #include <unistd.h>