Merge remote-tracking branch 'besser82/bugfix/json-c' into 0.15

2 files changed, 17 insertions, 1 deletions

diff --git a/include/sway_json_helper.h b/include/sway_json_helper.h
new file mode 100644
index 00000000..66f9cff1
--- /dev/null
+++ b/include/sway_json_helper.h
@@ -0,0 +1,16 @@
+#ifndef _SWAY_JSON_HELPER_H
+#define _SWAY_JSON_HELPER_H
+
+#include <json-c/json.h>
+
+// Macros for checking a specific version.
+#define JSON_C_VERSION_013 (13 << 8)
+
+// json-c v0.13 uses size_t for array_list_length().
+#if defined(JSON_C_VERSION_NUM) && JSON_C_VERSION_NUM >= JSON_C_VERSION_013
+typedef size_t json_ar_len_t;
+#else
+typedef int json_ar_len_t;
+#endif
+
+#endif // _SWAY_JSON_HELPER_H
diff --git a/include/swaygrab/json.h b/include/swaygrab/json.h
index c1093ef1..c0bd8587 100644
--- a/include/swaygrab/json.h
+++ b/include/swaygrab/json.h
@@ -1,4 +1,4 @@
-#include <json-c/json.h>
+#include "sway_json_helper.h"
 #include "wlc/wlc.h"
 
 void init_json_tree(int socketfd);