wdc: enable wdc-nvme.c build without json-c dependencies checking

Only build json print codes with CONFIG_JSONC build option instead.

Signed-off-by: Tokunori Ikegami <ikegami.t@gmail.com>

diff --git a/plugins/meson.build b/plugins/meson.build
index cddff65948a88214efa8a880e00c4502242b5bc8..3f49bf2764fb32ad93843c0290f6dca84a37ddde 100644 (file)
--- a/plugins/meson.build
+++ b/plugins/meson.build
@@ -3,8 +3,6 @@
 if json_c_dep.found()
   sources += [
     'plugins/solidigm/solidigm-nvme.c',
-    'plugins/wdc/wdc-nvme.c',
-    'plugins/wdc/wdc-utils.c',
   ]
   subdir('solidigm')
 endif
@@ -31,6 +29,8 @@ sources += [
   'plugins/toshiba/toshiba-nvme.c',
   'plugins/transcend/transcend-nvme.c',
   'plugins/virtium/virtium-nvme.c',
+  'plugins/wdc/wdc-nvme.c',
+  'plugins/wdc/wdc-utils.c',
   'plugins/ymtc/ymtc-nvme.c',
   'plugins/zns/zns.c',
 ]

diff --git a/util/json.h b/util/json.h
index 42f3b6baa44d6e91c4507bd68df6a9607b32eb28..a014803d715edf6fee12f19fabfb4efdb88e1fd4 100644 (file)
--- a/util/json.h
+++ b/util/json.h
@@ -58,8 +58,10 @@ struct json_object;
 #define json_create_object(o) NULL
 #define json_create_array(a) NULL
 #define json_free_object(o) ((void)(o))
-#define json_object_add_value_uint(o, k, v)
+#define json_object_add_value_uint(o, k, v) ((void)(v))
 #define json_object_add_value_int(o, k, v) ((void)(v))
+#define json_object_add_value_uint64(o, k, v) ((void)(v))
+#define json_object_add_value_uint128(o, k, v)
 #define json_object_add_value_double(o, k, v)
 #define json_object_add_value_array(o, k, v) ((void)(v))
 #define json_object_add_value_object(o, k, v) ((void)(v))