aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorIan Campbell <ian.campbell@citrix.com>2012-01-24 15:30:46 +0000
committerIan Campbell <ian.campbell@citrix.com>2012-01-24 15:30:46 +0000
commite0240a06f801239c7dc80ae6e247f107e2d0ac38 (patch)
treea7f36b014d84bbab66a164c31f8e7df909813b20 /tools
parent71e128629ec786f3e45f2cffdf0792125b76e520 (diff)
downloadxen-e0240a06f801239c7dc80ae6e247f107e2d0ac38.tar.gz
xen-e0240a06f801239c7dc80ae6e247f107e2d0ac38.tar.bz2
xen-e0240a06f801239c7dc80ae6e247f107e2d0ac38.zip
libxl: remove _libxl_json_internal.h from libxl_json.h
libxl_json.h is intended as a user-includable header for applications which would like to use libyajl directly with libxl types. It should not expose libxl internals. 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>
Diffstat (limited to 'tools')
-rw-r--r--tools/libxl/libxl_internal.h4
-rw-r--r--tools/libxl/libxl_json.h1
2 files changed, 3 insertions, 2 deletions
diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h
index 39e9e052fe..3c8da450f2 100644
--- a/tools/libxl/libxl_internal.h
+++ b/tools/libxl/libxl_internal.h
@@ -61,9 +61,11 @@
#include "flexarray.h"
#include "libxl_utils.h"
-#include "_libxl_types_internal.h"
#include "libxl_json.h"
+#include "_libxl_types_internal.h"
+#include "_libxl_types_internal_json.h"
+
#define LIBXL_DESTROY_TIMEOUT 10
#define LIBXL_DEVICE_MODEL_START_TIMEOUT 10
#define LIBXL_XENCONSOLE_LIMIT 1048576
diff --git a/tools/libxl/libxl_json.h b/tools/libxl/libxl_json.h
index 0715019ca5..720f6df10f 100644
--- a/tools/libxl/libxl_json.h
+++ b/tools/libxl/libxl_json.h
@@ -18,6 +18,5 @@
#include <yajl/yajl_gen.h>
#include <_libxl_types_json.h>
-#include <_libxl_types_internal_json.h>
#endif /* LIBXL_JSON_H */