summaryrefslogtreecommitdiff
path: root/sway/ipc-server.c
diff options
context:
space:
mode:
authorZandr Martin <[email protected]>2016-09-02 13:46:19 -0500
committerZandr Martin <[email protected]>2016-09-02 13:46:19 -0500
commit79ffea328c992c5109406771a59a9f016d85970d (patch)
tree5d965e72127f227ea0a38dc5c6e4fc14e08d9498 /sway/ipc-server.c
parentb374c35758777f98e5ddbe4b0dc43bd7c80f36d7 (diff)
parent4e6d7b125895955e3a84583c6d61f3eb2f8a4fe9 (diff)
Merge branch 'master' of git://github.com/SirCmpwn/sway into commands-refactor
Diffstat (limited to 'sway/ipc-server.c')
-rw-r--r--sway/ipc-server.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/sway/ipc-server.c b/sway/ipc-server.c
index 7039e348..70007f57 100644
--- a/sway/ipc-server.c
+++ b/sway/ipc-server.c
@@ -13,15 +13,15 @@
#include <json-c/json.h>
#include <list.h>
#include <libinput.h>
-#include "ipc-json.h"
-#include "ipc-server.h"
+#include "sway/ipc-json.h"
+#include "sway/ipc-server.h"
+#include "sway/config.h"
+#include "sway/commands.h"
+#include "sway/input.h"
+#include "stringop.h"
#include "log.h"
-#include "config.h"
-#include "commands.h"
#include "list.h"
-#include "stringop.h"
#include "util.h"
-#include "input.h"
static int ipc_socket = -1;
static struct wlc_event_source *ipc_event_source = NULL;