diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-04-03 08:17:38 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-04-03 08:17:38 +0000 |
| commit | d57675fc67455faf7c68d4003a1ce884779e2c7c (patch) | |
| tree | 3becd19ea8eda8827e45bf9e627d580fe614be64 /util/json.h | |
| parent | Releasing debian version 2.4-1. (diff) | |
| download | nvme-cli-d57675fc67455faf7c68d4003a1ce884779e2c7c.tar.xz nvme-cli-d57675fc67455faf7c68d4003a1ce884779e2c7c.zip | |
Merging upstream version 2.4+really2.3.
This reverts commit f42531334c05b7f49ae43c0a27e347a487fb2667.
Diffstat (limited to 'util/json.h')
| -rw-r--r-- | util/json.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/util/json.h b/util/json.h index c362408..1312cb8 100644 --- a/util/json.h +++ b/util/json.h @@ -2,7 +2,6 @@ #ifndef __JSON__H #define __JSON__H -#ifdef CONFIG_JSONC #include <json.h> #include "util/types.h" @@ -13,7 +12,7 @@ #define json_free_object(o) json_object_put(o) #define json_free_array(a) json_object_put(a) #define json_object_add_value_uint(o, k, v) \ - json_object_object_add(o, k, json_object_new_uint64(v)) + 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)) #ifndef CONFIG_JSONC_14 @@ -49,11 +48,4 @@ struct json_object *util_json_object_new_uint128(nvme_uint128_t val); struct json_object *util_json_object_new_uint128(nvme_uint128_t val); uint64_t util_json_object_get_uint64(struct json_object *obj); - -#else /* !CONFIG_JSONC */ - -struct json_object; - -#endif - #endif |