diff options
author | Drew DeVault <sir@cmpwn.com> | 2018-01-04 11:00:47 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-04 11:00:47 -0500 |
commit | 7dad5cd18c57d632093778e526a811d07aca8fe6 (patch) | |
tree | 7b88fa1609b8445e3ef9ad773245e9386542f867 | |
parent | Merge pull request #1539 from acrisci/bindings (diff) | |
parent | update json-c dep to 0.13 (diff) | |
download | sway-7dad5cd18c57d632093778e526a811d07aca8fe6.tar.gz sway-7dad5cd18c57d632093778e526a811d07aca8fe6.tar.zst sway-7dad5cd18c57d632093778e526a811d07aca8fe6.zip |
Merge pull request #1549 from rkanati/wlroots
update json-c dep to 0.13
-rw-r--r-- | meson.build | 2 | ||||
-rw-r--r-- | swaymsg/main.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meson.build b/meson.build index 029aea46..49392126 100644 --- a/meson.build +++ b/meson.build | |||
@@ -18,7 +18,7 @@ datadir = get_option('datadir') | |||
18 | sysconfdir = get_option('sysconfdir') | 18 | sysconfdir = get_option('sysconfdir') |
19 | prefix = get_option('prefix') | 19 | prefix = get_option('prefix') |
20 | 20 | ||
21 | jsonc = dependency('json-c', version: '>=0.12.1') | 21 | jsonc = dependency('json-c', version: '>=0.13') |
22 | pcre = dependency('libpcre') | 22 | pcre = dependency('libpcre') |
23 | wlroots = dependency('wlroots') | 23 | wlroots = dependency('wlroots') |
24 | wayland_server = dependency('wayland-server') | 24 | wayland_server = dependency('wayland-server') |
diff --git a/swaymsg/main.c b/swaymsg/main.c index 8a720fca..a34eced4 100644 --- a/swaymsg/main.c +++ b/swaymsg/main.c | |||
@@ -156,7 +156,7 @@ static void pretty_print_version(json_object *v) { | |||
156 | static void pretty_print_clipboard(json_object *v) { | 156 | static void pretty_print_clipboard(json_object *v) { |
157 | if (success(v, true)) { | 157 | if (success(v, true)) { |
158 | if (json_object_is_type(v, json_type_array)) { | 158 | if (json_object_is_type(v, json_type_array)) { |
159 | for (int i = 0; i < json_object_array_length(v); ++i) { | 159 | for (size_t i = 0; i < json_object_array_length(v); ++i) { |
160 | json_object *o = json_object_array_get_idx(v, i); | 160 | json_object *o = json_object_array_get_idx(v, i); |
161 | printf("%s\n", json_object_get_string(o)); | 161 | printf("%s\n", json_object_get_string(o)); |
162 | } | 162 | } |