blob: bd1ec9155149034a87637116adf95b551dbb6cea (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
|
From 840f01135d2892f45e71b9e90405de587991bd03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
Date: Mon, 13 Apr 2020 14:12:25 +0200
Subject: [PATCH 19/25] Add support for upcoming json-c 0.14.0.
TRUE/FALSE are not defined anymore. 1 and 0 are used instead.
Signed-off-by: Gustavo B. Schenkel <gustavo.schenkel@gmail.com>
---
u2f-host/u2fmisc.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/u2f-host/u2fmisc.c b/u2f-host/u2fmisc.c
index e40ca3d..5a032ce 100644
--- a/u2f-host/u2fmisc.c
+++ b/u2f-host/u2fmisc.c
@@ -33,6 +33,19 @@ typedef int json_bool;
#define u2fh_json_object_object_get(obj, key, value) (value = json_object_object_get(obj, key)) == NULL ? (json_bool)FALSE : (json_bool)TRUE
#endif
+/* json-c 0.13.99 does not define TRUE/FALSE anymore
+ * the json-c maintainers replaced them with pure 1/0
+ * https://github.com/json-c/json-c/commit/0992aac61f8b
+ */
+#if defined JSON_C_VERSION_NUM && JSON_C_VERSION_NUM >= ((13 << 8) | 99)
+#ifndef FALSE
+#define FALSE 0
+#endif
+#ifndef TRUE
+#define TRUE 1
+#endif
+#endif
+
static void
dumpHex (unsigned char *data, int offs, int len)
{
--
2.32.0
|
