diff options
| author |  Drew DeVault <sir@cmpwn.com> | 2017-12-17 15:51:49 -0500 |
|---|---|---|
| committer | Drew DeVault <sir@cmpwn.com> | 2017-12-17 15:51:49 -0500 |
| commit | 1c4a086e7556475139960a25cb642f115d057c23 (patch) | |
| tree | baa407363899155a876ea6993ad55020059c5cfd /include/swaygrab/json.h | |
| parent | Merge pull request #1519 from ggreer/clear-password-buffer-0.15 (diff) | |
| parent | Adaptions for API change in json-c v0.13 (diff) | |
| download | sway-1c4a086e7556475139960a25cb642f115d057c23.tar.gz sway-1c4a086e7556475139960a25cb642f115d057c23.tar.zst sway-1c4a086e7556475139960a25cb642f115d057c23.zip | |
Merge remote-tracking branch 'besser82/bugfix/json-c' into 0.15
Diffstat (limited to 'include/swaygrab/json.h')
| -rw-r--r-- | include/swaygrab/json.h | 2 |
1 files changed, 1 insertions, 1 deletions
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); |