From d0bd0ed59887fdbcbe0630c23e5d1cc6a254340c Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Sun, 17 Dec 2017 15:52:34 -0500
Subject: Revert "Merge remote-tracking branch 'besser82/bugfix/json-c' into
 0.15"

This reverts commit 1c4a086e7556475139960a25cb642f115d057c23, reversing
changes made to 1263ea6497c732bfa1835eea4a8ffe2e6ea6e377.
---
 swaylock/main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'swaylock')

diff --git a/swaylock/main.c b/swaylock/main.c
index 3208a45b..4b486461 100644
--- a/swaylock/main.c
+++ b/swaylock/main.c
@@ -3,6 +3,7 @@
 #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>
@@ -13,7 +14,6 @@
 #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 (json_ar_len_t j = 0;; ++j) {
+				for (int 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);
-- 
cgit v1.2.3