From d0bd0ed59887fdbcbe0630c23e5d1cc6a254340c Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Sun, 17 Dec 2017 15:52:34 -0500 Subject: Revert "Merge remote-tracking branch 'besser82/bugfix/json-c' into 0.15" This reverts commit 1c4a086e7556475139960a25cb642f115d057c23, reversing changes made to 1263ea6497c732bfa1835eea4a8ffe2e6ea6e377. --- include/sway_json_helper.h | 16 ---------------- include/swaygrab/json.h | 2 +- 2 files changed, 1 insertion(+), 17 deletions(-) delete mode 100644 include/sway_json_helper.h (limited to 'include') diff --git a/include/sway_json_helper.h b/include/sway_json_helper.h deleted file mode 100644 index 66f9cff1..00000000 --- a/include/sway_json_helper.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef _SWAY_JSON_HELPER_H -#define _SWAY_JSON_HELPER_H - -#include - -// 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 c0bd8587..c1093ef1 100644 --- a/include/swaygrab/json.h +++ b/include/swaygrab/json.h @@ -1,4 +1,4 @@ -#include "sway_json_helper.h" +#include #include "wlc/wlc.h" void init_json_tree(int socketfd); -- cgit v1.2.3-54-g00ecf