Merging upstream version 2.4+really2.4.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
f52576e699
commit
be98c20625
458 changed files with 7148 additions and 5151 deletions
10
util/json.h
10
util/json.h
|
@ -2,6 +2,7 @@
|
|||
#ifndef __JSON__H
|
||||
#define __JSON__H
|
||||
|
||||
#ifdef CONFIG_JSONC
|
||||
#include <json.h>
|
||||
#include "util/types.h"
|
||||
|
||||
|
@ -12,7 +13,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_int(v))
|
||||
json_object_object_add(o, k, json_object_new_uint64(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
|
||||
|
@ -48,4 +49,11 @@ 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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue