From 3d3d856c919fd6a1972256bfb2f26430adffce1c Mon Sep 17 00:00:00 2001 From: Daniel Borkmann Date: Thu, 11 Jul 2013 10:57:53 +0200 Subject: curvetun_mgmt: consolidate the two mgmt include files into one Consolidate the two mgmt include files into one. Signed-off-by: Daniel Borkmann --- curvetun.c | 3 +-- curvetun_client.c | 3 +-- curvetun_mgmt.h | 7 +++++++ curvetun_server.c | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) create mode 100644 curvetun_mgmt.h diff --git a/curvetun.c b/curvetun.c index 00bbecc..fbc1ea3 100644 --- a/curvetun.c +++ b/curvetun.c @@ -35,8 +35,7 @@ #include "curvetun.h" #include "curve.h" #include "config.h" -#include "curvetun_mgmt_users.h" -#include "curvetun_mgmt_servers.h" +#include "curvetun_mgmt.h" #include "ioops.h" #include "tprintf.h" #include "crypto.h" diff --git a/curvetun_client.c b/curvetun_client.c index 32818a2..19fe94c 100644 --- a/curvetun_client.c +++ b/curvetun_client.c @@ -35,8 +35,7 @@ #include "corking.h" #include "ioexact.h" #include "curvetun.h" -#include "curvetun_mgmt_servers.h" -#include "curvetun_mgmt_users.h" +#include "curvetun_mgmt.h" #include "crypto.h" extern volatile sig_atomic_t sigint; diff --git a/curvetun_mgmt.h b/curvetun_mgmt.h new file mode 100644 index 0000000..6016925 --- /dev/null +++ b/curvetun_mgmt.h @@ -0,0 +1,7 @@ +#ifndef CURVETUN_MGMT_H +#define CURVETUN_MGMT_H + +#include "curvetun_mgmt_servers.h" +#include "curvetun_mgmt_users.h" + +#endif /* CURVETUN_MGMT_H */ diff --git a/curvetun_server.c b/curvetun_server.c index bb704b0..097295b 100644 --- a/curvetun_server.c +++ b/curvetun_server.c @@ -39,7 +39,7 @@ #include "cpus.h" #include "sock.h" #include "built_in.h" -#include "curvetun_mgmt_users.h" +#include "curvetun_mgmt.h" #include "cpusched.h" #include "trie.h" -- cgit v1.2.3-54-g00ecf