From: Steven Seungcheol Lee Date: Tue, 10 Aug 2021 05:08:36 +0000 (+0900) Subject: Check json-c libversion, recover commit d127537 X-Git-Tag: v2.0-rc0~53^2~18 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=0b63a8b7cfb78b7354631a9f9ff35651802526fb;p=users%2Fsagi%2Fnvme-cli.git Check json-c libversion, recover commit d127537 The fix commit support json-c >= 0.14-20200419 If version lower than 0.14, using util/json.h util/json.c Signed-off-by: Steven Seungcheol Lee --- diff --git a/Makefile b/Makefile index 4da13d55..74d61c17 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ override CPPFLAGS += -D_GNU_SOURCE -D__CHECK_ENDIAN__ -I. LIBUUID = $(shell $(LD) -o /dev/null -luuid >/dev/null 2>&1; echo $$?) LIBHUGETLBFS = $(shell $(LD) -o /dev/null -lhugetlbfs >/dev/null 2>&1; echo $$?) HAVE_SYSTEMD = $(shell pkg-config --exists libsystemd --atleast-version=242; echo $$?) -LIBJSONC = $(shell $(LD) -o /dev/null -ljson-c >/dev/null 2>&1; echo $$?) +LIBJSONC = $(shell pkg-config --atleast-version=0.14 json-c; echo $$?) NVME = nvme INSTALL ?= install DESTDIR = diff --git a/nvme.h b/nvme.h index eb7d63ff..af16dbf7 100644 --- a/nvme.h +++ b/nvme.h @@ -30,9 +30,9 @@ #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)) + json_object_object_add(o, k, json_object_new_int64(v)) #define json_object_add_value_float(o, k, v) \ json_object_object_add(o, k, json_object_new_double(v)) #define json_object_add_value_string(o, k, v) \