diff options
-rw-r--r-- | config-parse.c (renamed from config.c) | 2 | ||||
-rw-r--r-- | config-parse.h (renamed from config.h) | 4 | ||||
-rw-r--r-- | idle.c | 1 | ||||
-rw-r--r-- | main.c | 2 | ||||
-rw-r--r-- | meson.build | 2 | ||||
-rw-r--r-- | server-config.c | 2 | ||||
-rw-r--r-- | server.c | 2 |
7 files changed, 7 insertions, 8 deletions
diff --git a/config.c b/config-parse.c index eb980f8..34fbc64 100644 --- a/config.c +++ b/config-parse.c @@ -10,7 +10,7 @@ #include "main.h" #include "uring.h" -#include "config.h" +#include "config-parse.h" #include "server.h" static void diff --git a/config.h b/config-parse.h index a88be90..c8d10dc 100644 --- a/config.h +++ b/config-parse.h @@ -1,5 +1,5 @@ -#ifndef fooconfighfoo -#define fooconfighfoo +#ifndef fooconfigparsehfoo +#define fooconfigparsehfoo #define _GNU_SOURCE #include <sys/types.h> @@ -10,7 +10,6 @@ #include "main.h" #include "uring.h" -#include "config.h" #include "server.h" #include "idle.h" @@ -19,7 +19,7 @@ #include "main.h" #include "uring.h" -#include "config.h" +#include "config-parse.h" #include "server.h" #include "server-config.h" #include "announce.h" diff --git a/meson.build b/meson.build index a4472cd..9348482 100644 --- a/meson.build +++ b/meson.build @@ -11,7 +11,7 @@ mcproxy_sources = [ 'server-proxy.c', 'server-config.c', 'announce.c', - 'config.c', + 'config-parse.c', 'rcon.c', 'idle.c', 'igmp.c', diff --git a/server-config.c b/server-config.c index d42022b..03259ca 100644 --- a/server-config.c +++ b/server-config.c @@ -12,7 +12,7 @@ #include "main.h" #include "uring.h" -#include "config.h" +#include "config-parse.h" #include "server.h" #include "server-config.h" @@ -16,7 +16,7 @@ #include "server.h" #include "server-proxy.h" #include "utils.h" -#include "config.h" +#include "config-parse.h" #include "idle.h" #include "rcon.h" #include "systemd.h" |