diff options
author | Daniel Borkmann <dborkman@redhat.com> | 2013-07-11 10:57:53 +0200 |
---|---|---|
committer | Daniel Borkmann <dborkman@redhat.com> | 2013-07-11 10:57:53 +0200 |
commit | 3d3d856c919fd6a1972256bfb2f26430adffce1c (patch) | |
tree | 69b965499ae661e2e4ff86b2d8370e7543362919 | |
parent | 17144ba9391419c59c4caeca9989d660c1035df4 (diff) |
curvetun_mgmt: consolidate the two mgmt include files into one
Consolidate the two mgmt include files into one.
Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
-rw-r--r-- | curvetun.c | 3 | ||||
-rw-r--r-- | curvetun_client.c | 3 | ||||
-rw-r--r-- | curvetun_mgmt.h | 7 | ||||
-rw-r--r-- | curvetun_server.c | 2 |
4 files changed, 10 insertions, 5 deletions
@@ -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" |