diff options
author | Drew DeVault <sir@cmpwn.com> | 2017-12-17 15:52:34 -0500 |
---|---|---|
committer | Drew DeVault <sir@cmpwn.com> | 2017-12-17 15:52:34 -0500 |
commit | d0bd0ed59887fdbcbe0630c23e5d1cc6a254340c (patch) | |
tree | 4444227f247f9b7cdb854144eb4332e607c34987 /include/sway_json_helper.h | |
parent | Merge remote-tracking branch 'besser82/bugfix/json-c' into 0.15 (diff) | |
download | sway-d0bd0ed59887fdbcbe0630c23e5d1cc6a254340c.tar.gz sway-d0bd0ed59887fdbcbe0630c23e5d1cc6a254340c.tar.zst sway-d0bd0ed59887fdbcbe0630c23e5d1cc6a254340c.zip |
Revert "Merge remote-tracking branch 'besser82/bugfix/json-c' into 0.15"
This reverts commit 1c4a086e7556475139960a25cb642f115d057c23, reversing
changes made to 1263ea6497c732bfa1835eea4a8ffe2e6ea6e377.
Diffstat (limited to 'include/sway_json_helper.h')
-rw-r--r-- | include/sway_json_helper.h | 16 |
1 files changed, 0 insertions, 16 deletions
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 @@ | |||
1 | #ifndef _SWAY_JSON_HELPER_H | ||
2 | #define _SWAY_JSON_HELPER_H | ||
3 | |||
4 | #include <json-c/json.h> | ||
5 | |||
6 | // Macros for checking a specific version. | ||
7 | #define JSON_C_VERSION_013 (13 << 8) | ||
8 | |||
9 | // json-c v0.13 uses size_t for array_list_length(). | ||
10 | #if defined(JSON_C_VERSION_NUM) && JSON_C_VERSION_NUM >= JSON_C_VERSION_013 | ||
11 | typedef size_t json_ar_len_t; | ||
12 | #else | ||
13 | typedef int json_ar_len_t; | ||
14 | #endif | ||
15 | |||
16 | #endif // _SWAY_JSON_HELPER_H | ||