diff options
| author | Furkan Sahin <furkan-dev@proton.me> | 2017-12-17 15:51:49 -0500 |
|---|---|---|
| committer | Furkan Sahin <furkan-dev@proton.me> | 2017-12-17 15:51:49 -0500 |
| commit | a427d79c013a14ce196ca8dac5644ff2c76637ca (patch) | |
| tree | baa407363899155a876ea6993ad55020059c5cfd /swaylock | |
| parent | f896cb48106e704a57f93790b46fa7e183d646eb (diff) | |
| parent | 0859848c24b2a32a29d988739a38e4c34b8411f9 (diff) | |
Merge remote-tracking branch 'besser82/bugfix/json-c' into 0.15
Diffstat (limited to 'swaylock')
| -rw-r--r-- | swaylock/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/swaylock/main.c b/swaylock/main.c index 4b486461..3208a45b 100644 --- a/swaylock/main.c +++ b/swaylock/main.c @@ -3,7 +3,6 @@ #include <xkbcommon/xkbcommon.h> #include <xkbcommon/xkbcommon-names.h> #include <security/pam_appl.h> -#include <json-c/json.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -14,6 +13,7 @@ #include <signal.h> #include <stdbool.h> #include <unistd.h> +#include "sway_json_helper.h" #include "client/window.h" #include "client/registry.h" #include "client/cairo.h" @@ -583,7 +583,7 @@ int main(int argc, char **argv) { for (i = 0; i < registry->outputs->length; ++i) { if (displays_paths[i * 2] != NULL) { - for (int j = 0;; ++j) { + for (json_ar_len_t j = 0;; ++j) { if (j >= json_object_array_length(json_outputs)) { sway_log(L_ERROR, "%s is not an extant output", displays_paths[i * 2]); exit(EXIT_FAILURE); |