utils/json: Add json_object_new_uint64 for json-c < 0.14

json-c 0.14 added json_object_new_uint64 but older version are missing
this function. Instead defining two different json_object_object_add
version we can just define the fallback function first.

[dwagner: rewrote the commit message]
Signed-off-by: Daniel Wagner <dwagner@suse.de>

diff --git a/util/json.h b/util/json.h
index bf2cd38fb604b4141e7cb01dbaebd87ca2ac4d75..db951219ed8e9b0461c74959e22ba5027b30ebb9 100644 (file)
--- a/util/json.h
+++ b/util/json.h
@@ -15,13 +15,11 @@
        json_object_object_add(o, k, json_object_new_int(v))
 #define json_object_add_value_int(o, k, v) \
        json_object_object_add(o, k, json_object_new_int(v))
-#ifdef CONFIG_JSONC_14
+#ifndef CONFIG_JSONC_14
+#define json_object_new_uint64(v) util_json_object_new_uint64(v)
+#endif
 #define json_object_add_value_uint64(o, k, v) \
        json_object_object_add(o, k, json_object_new_uint64(v))
-#else
-#define json_object_add_value_uint64(o, k, v) \
-       json_object_object_add(o, k, util_json_object_new_uint64(v))
-#endif
 #define json_object_add_value_uint128(o, k, v) \
        json_object_object_add(o, k, util_json_object_new_uint128(v))
 #define json_object_add_value_double(o, k, v) \