From 829ea0768672dad977ddeb30dd5e2b254bb4a4e9 Mon Sep 17 00:00:00 2001
From: David Härdeman <david@hardeman.nu>
Date: Wed, 1 Jul 2020 17:06:54 +0200
Subject: Change include configuration for shared directory to make header
 includes clearer

---
 minecctl/mc-commands.c   | 4 ++--
 minecctl/minecctl.c      | 3 +--
 minecctl/misc-commands.c | 2 +-
 minecctl/misc.c          | 3 ++-
 minecctl/rcon-commands.c | 4 ++--
 minecctl/server.c        | 2 +-
 minecctl/server.h        | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'minecctl')

diff --git a/minecctl/mc-commands.c b/minecctl/mc-commands.c
index 424eae9..648af0e 100644
--- a/minecctl/mc-commands.c
+++ b/minecctl/mc-commands.c
@@ -1,11 +1,11 @@
 #include <unistd.h>
 
-#include "utils.h"
+#include "shared/utils.h"
 #include "minecctl.h"
 #include "server.h"
 #include "mc-commands.h"
 #include "misc.h"
-#include "mc-protocol.h"
+#include "shared/mc-protocol.h"
 
 bool do_mc_pcount(struct cfg *cfg, unsigned *online, unsigned *max)
 {
diff --git a/minecctl/minecctl.c b/minecctl/minecctl.c
index 69286fc..b8d26d9 100644
--- a/minecctl/minecctl.c
+++ b/minecctl/minecctl.c
@@ -12,14 +12,13 @@
 #include <dirent.h>
 #include <termios.h>
 
-#include "utils.h"
+#include "shared/utils.h"
 #include "minecctl.h"
 #include "minecctl-commands.h"
 #include "server.h"
 #include "rcon-commands.h"
 #include "misc-commands.h"
 #include "misc.h"
-#include "config-parser.h"
 #include "config.h"
 
 static void dump_config(struct cfg *cfg)
diff --git a/minecctl/misc-commands.c b/minecctl/misc-commands.c
index a4188f9..8dd6bd2 100644
--- a/minecctl/misc-commands.c
+++ b/minecctl/misc-commands.c
@@ -1,4 +1,4 @@
-#include "utils.h"
+#include "shared/utils.h"
 #include "minecctl.h"
 #include "server.h"
 #include "misc-commands.h"
diff --git a/minecctl/misc.c b/minecctl/misc.c
index e2d6b02..3f5ba50 100644
--- a/minecctl/misc.c
+++ b/minecctl/misc.c
@@ -5,7 +5,8 @@
 #include <string.h>
 #include <termios.h>
 
-#include "utils.h"
+#include "shared/utils.h"
+#include "misc.h"
 #include "minecctl.h"
 
 bool use_colors = false;
diff --git a/minecctl/rcon-commands.c b/minecctl/rcon-commands.c
index 2f1687b..eff397d 100644
--- a/minecctl/rcon-commands.c
+++ b/minecctl/rcon-commands.c
@@ -9,11 +9,11 @@
 #include <string.h>
 #include <stdarg.h>
 
-#include "utils.h"
+#include "shared/utils.h"
+#include "shared/rcon-protocol.h"
 #include "minecctl.h"
 #include "rcon-commands.h"
 #include "server.h"
-#include "rcon-protocol.h"
 #include "misc.h"
 
 static void send_packet(int sfd, const char *buf, size_t len)
diff --git a/minecctl/server.c b/minecctl/server.c
index 658254f..93882f1 100644
--- a/minecctl/server.c
+++ b/minecctl/server.c
@@ -3,7 +3,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
-#include "utils.h"
+#include "shared/utils.h"
 #include "minecctl.h"
 #include "server.h"
 #include "misc.h"
diff --git a/minecctl/server.h b/minecctl/server.h
index a0c0a76..61eba5f 100644
--- a/minecctl/server.h
+++ b/minecctl/server.h
@@ -3,7 +3,7 @@
 
 #include <stdbool.h>
 
-#include "config-parser.h"
+#include "shared/config-parser.h"
 
 struct server {
 	bool file_read;
-- 
cgit v1.2.3