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 /swaymsg | |
| parent | 1263ea6497c732bfa1835eea4a8ffe2e6ea6e377 (diff) | |
| parent | 02da9c4e7cafb36083566e511cc7913d8922aaa6 (diff) | |
Merge remote-tracking branch 'besser82/bugfix/json-c' into 0.15
Diffstat (limited to 'swaymsg')
| -rw-r--r-- | swaymsg/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/swaymsg/main.c b/swaymsg/main.c index 2f9cfb14..0ee7c76f 100644 --- a/swaymsg/main.c +++ b/swaymsg/main.c @@ -9,7 +9,7 @@ #include <sys/socket.h> #include <ctype.h> #include <unistd.h> -#include <json-c/json.h> +#include "sway_json_helper.h" #include "stringop.h" #include "ipc-client.h" #include "readline.h" @@ -149,7 +149,7 @@ static void pretty_print_version(json_object *v) { static void pretty_print_clipboard(json_object *v) { if (success(v, true)) { if (json_object_is_type(v, json_type_array)) { - for (int i = 0; i < json_object_array_length(v); ++i) { + for (json_ar_len_t i = 0; i < json_object_array_length(v); ++i) { json_object *o = json_object_array_get_idx(v, i); printf("%s\n", json_object_get_string(o)); } |