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>

diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h
index 39e9e052fe3e9571f11ca31ac7f606f8cd7ff6ce..3c8da450f2febf68c216cdffd5eb89035f1c22fb 100644 (file)
--- 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 0715019ca58c4f7c63c46763fa7af0bfcb98c389..720f6df10f7acaf503c56b2a5e9fd443c9ac7a5a 100644 (file)
--- 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 */