diff options
| author | Furkan Sahin <furkan-dev@proton.me> | 2017-12-17 15:52:34 -0500 |
|---|---|---|
| committer | Furkan Sahin <furkan-dev@proton.me> | 2017-12-17 15:52:34 -0500 |
| commit | 730c74c475ee4587a280e6ffc6229edceca8fcf2 (patch) | |
| tree | 4444227f247f9b7cdb854144eb4332e607c34987 /include | |
| parent | a427d79c013a14ce196ca8dac5644ff2c76637ca (diff) | |
Revert "Merge remote-tracking branch 'besser82/bugfix/json-c' into 0.15"
This reverts commit a427d79c013a14ce196ca8dac5644ff2c76637ca, reversing
changes made to f896cb48106e704a57f93790b46fa7e183d646eb.
Diffstat (limited to 'include')
| -rw-r--r-- | include/sway_json_helper.h | 16 | ||||
| -rw-r--r-- | include/swaygrab/json.h | 2 |
2 files changed, 1 insertions, 17 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 @@ -#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 c0bd8587..c1093ef1 100644 --- a/include/swaygrab/json.h +++ b/include/swaygrab/json.h @@ -1,4 +1,4 @@ -#include "sway_json_helper.h" +#include <json-c/json.h> #include "wlc/wlc.h" void init_json_tree(int socketfd); |