29 lines
1.1 KiB
Diff
29 lines
1.1 KiB
Diff
From 8438a9cd8d7ed88645fa8e6a8f19c0fd9ae872a7 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
|
|
Date: Mon, 13 Apr 2020 19:22:02 +0200
|
|
Subject: [PATCH] Add support for upcoming json-c 0.14.0.
|
|
|
|
TRUE/FALSE are not defined anymore. 1 and 0 are used instead.
|
|
This is backwards compatible, as earlier versions of json-c are
|
|
using the same integer values in their present definitions.
|
|
---
|
|
libdmmp/libdmmp_private.h | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/libdmmp/libdmmp_private.h b/libdmmp/libdmmp_private.h
|
|
index ac85b63f..4378962b 100644
|
|
--- a/libdmmp/libdmmp_private.h
|
|
+++ b/libdmmp/libdmmp_private.h
|
|
@@ -82,7 +82,7 @@ static out_type func_name(struct dmmp_context *ctx, const char *var_name) { \
|
|
do { \
|
|
json_type j_type = json_type_null; \
|
|
json_object *j_obj_tmp = NULL; \
|
|
- if (json_object_object_get_ex(j_obj, key, &j_obj_tmp) != TRUE) { \
|
|
+ if (json_object_object_get_ex(j_obj, key, &j_obj_tmp) != 1) { \
|
|
_error(ctx, "Invalid JSON output from multipathd IPC: " \
|
|
"key '%s' not found", key); \
|
|
rc = DMMP_ERR_IPC_ERROR; \
|
|
--
|
|
2.26.0
|
|
|