diff options
author | 2017-12-14 01:30:54 +0100 | |
---|---|---|
committer | 2017-12-17 15:53:22 -0500 | |
commit | c08c805ecd8f2000a35cdeae7b16244d0b3c0528 (patch) | |
tree | 8a1a12a32a1d2c40bc4fdb43aa7205362438f65b /include | |
parent | Revert "Merge remote-tracking branch 'besser82/bugfix/json-c' into 0.15" (diff) | |
download | sway-c08c805ecd8f2000a35cdeae7b16244d0b3c0528.tar.gz sway-c08c805ecd8f2000a35cdeae7b16244d0b3c0528.tar.zst sway-c08c805ecd8f2000a35cdeae7b16244d0b3c0528.zip |
Adaptions for API change in json-c v0.130.15.1
Lift restriction on json-c <= 0.12.1
ipc-server: Acquire ownership of referenced json_object properly
When adding a referenced json_object with an unknown lifetime to
another json_object, it must be done with a wrapped call to
json_object_get() to acquire the ownership of that json_object.
Diffstat (limited to 'include')
-rw-r--r-- | include/sway_json_helper.h | 16 | ||||
-rw-r--r-- | include/swaygrab/json.h | 2 |
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 @@ | |||
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 | ||
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 @@ | |||
1 | #include <json-c/json.h> | 1 | #include "sway_json_helper.h" |
2 | #include "wlc/wlc.h" | 2 | #include "wlc/wlc.h" |
3 | 3 | ||
4 | void init_json_tree(int socketfd); | 4 | void init_json_tree(int socketfd); |