From e101ee667b55c8bcb2b4d87123fe82779451be90 Mon Sep 17 00:00:00 2001 From: Wei Liu Date: Tue, 10 Jun 2014 22:21:40 +0100 Subject: [PATCH] libxl: move some internal functions to libxl_internal.h In 752f181f ("libxl_json: introduce parser functions for builtin types") a bunch of parser functions are added to libxl_json.h, which breaks GCC < 4.6. These functions are internal and libxl_json.h is public header, so move them to libxl_internal.h. Signed-off-by: Wei Liu Acked-by: Ian Campbell --- tools/libxl/libxl_internal.h | 32 ++++++++++++++++++++++++++++++++ tools/libxl/libxl_json.h | 35 ----------------------------------- 2 files changed, 32 insertions(+), 35 deletions(-) diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 80ea88350a..a0d4f241d4 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -3147,6 +3147,38 @@ void libxl__numa_candidate_put_nodemap(libxl__gc *gc, */ #define CTYPE(isfoo,c) (isfoo((unsigned char)(c))) +int libxl_defbool_parse_json(libxl__gc *gc, const libxl__json_object *o, + libxl_defbool *p); +int libxl__bool_parse_json(libxl__gc *gc, const libxl__json_object *o, + bool *p); +int libxl_mac_parse_json(libxl__gc *gc, const libxl__json_object *o, + libxl_mac *p); +int libxl_bitmap_parse_json(libxl__gc *gc, const libxl__json_object *o, + libxl_bitmap *p); +int libxl_uuid_parse_json(libxl__gc *gc, const libxl__json_object *o, + libxl_uuid *p); +int libxl_cpuid_policy_list_parse_json(libxl__gc *gc, + const libxl__json_object *o, + libxl_cpuid_policy_list *p); +int libxl_string_list_parse_json(libxl__gc *gc, const libxl__json_object *o, + libxl_string_list *p); +int libxl_key_value_list_parse_json(libxl__gc *gc, + const libxl__json_object *o, + libxl_key_value_list *p); +int libxl_hwcap_parse_json(libxl__gc *gc, const libxl__json_object *o, + libxl_hwcap *p); +int libxl__int_parse_json(libxl__gc *gc, const libxl__json_object *o, + void *p); +int libxl__uint8_parse_json(libxl__gc *gc, const libxl__json_object *o, + void *p); +int libxl__uint16_parse_json(libxl__gc *gc, const libxl__json_object *o, + void *p); +int libxl__uint32_parse_json(libxl__gc *gc, const libxl__json_object *o, + void *p); +int libxl__uint64_parse_json(libxl__gc *gc, const libxl__json_object *o, + void *p); +int libxl__string_parse_json(libxl__gc *gc, const libxl__json_object *o, + char **p); #endif diff --git a/tools/libxl/libxl_json.h b/tools/libxl/libxl_json.h index b196c1cf64..e4c0f6ce62 100644 --- a/tools/libxl/libxl_json.h +++ b/tools/libxl/libxl_json.h @@ -22,52 +22,17 @@ # include #endif -typedef struct libxl__gc libxl__gc; -typedef struct libxl__json_object libxl__json_object; - yajl_gen_status libxl__uint64_gen_json(yajl_gen hand, uint64_t val); yajl_gen_status libxl_defbool_gen_json(yajl_gen hand, libxl_defbool *p); -int libxl_defbool_parse_json(libxl__gc *gc, const libxl__json_object *o, - libxl_defbool *p); -int libxl__bool_parse_json(libxl__gc *gc, const libxl__json_object *o, - bool *p); yajl_gen_status libxl_uuid_gen_json(yajl_gen hand, libxl_uuid *p); -int libxl_uuid_parse_json(libxl__gc *gc, const libxl__json_object *o, - libxl_uuid *p); yajl_gen_status libxl_mac_gen_json(yajl_gen hand, libxl_mac *p); -int libxl_mac_parse_json(libxl__gc *gc, const libxl__json_object *o, - libxl_mac *p); yajl_gen_status libxl_bitmap_gen_json(yajl_gen hand, libxl_bitmap *p); -int libxl_bitmap_parse_json(libxl__gc *gc, const libxl__json_object *o, - libxl_bitmap *p); yajl_gen_status libxl_cpuid_policy_list_gen_json(yajl_gen hand, libxl_cpuid_policy_list *p); -int libxl_cpuid_policy_list_parse_json(libxl__gc *gc, - const libxl__json_object *o, - libxl_cpuid_policy_list *p); yajl_gen_status libxl_string_list_gen_json(yajl_gen hand, libxl_string_list *p); -int libxl_string_list_parse_json(libxl__gc *gc, const libxl__json_object *o, - libxl_string_list *p); yajl_gen_status libxl_key_value_list_gen_json(yajl_gen hand, libxl_key_value_list *p); -int libxl_key_value_list_parse_json(libxl__gc *gc, - const libxl__json_object *o, - libxl_key_value_list *p); yajl_gen_status libxl_hwcap_gen_json(yajl_gen hand, libxl_hwcap *p); -int libxl_hwcap_parse_json(libxl__gc *gc, const libxl__json_object *o, - libxl_hwcap *p); -int libxl__int_parse_json(libxl__gc *gc, const libxl__json_object *o, - void *p); -int libxl__uint8_parse_json(libxl__gc *gc, const libxl__json_object *o, - void *p); -int libxl__uint16_parse_json(libxl__gc *gc, const libxl__json_object *o, - void *p); -int libxl__uint32_parse_json(libxl__gc *gc, const libxl__json_object *o, - void *p); -int libxl__uint64_parse_json(libxl__gc *gc, const libxl__json_object *o, - void *p); -int libxl__string_parse_json(libxl__gc *gc, const libxl__json_object *o, - char **p); #include <_libxl_types_json.h> -- 2.30.2