From: leonardo.da.cunha Date: Thu, 27 Oct 2022 22:46:22 +0000 (-0700) Subject: utils/json: Add json_object_new_uint64 for json-c < 0.14 X-Git-Tag: v2.2~9 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=828bdff38429353f44d5ebfaf705b548f7e95e3f;p=users%2Fsagi%2Fnvme-cli.git 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 --- diff --git a/util/json.h b/util/json.h index bf2cd38f..db951219 100644 --- 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) \