Move recv/send_msg declarations to messages.h

4 files changed, 24 insertions, 14 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index ef92bee..bd88993 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
 bin_PROGRAMS = cmumble
 
-noinst_HEADERS = cmumble.h varint.h io.h connection.h
+noinst_HEADERS = cmumble.h messages.h varint.h io.h connection.h
 nodist_noinst_HEADERS = mumble.pb-c.h message_list.h
 
 cmumble_SOURCES = cmumble.c messages.c varint.c io.c connection.c
diff --git a/src/cmumble.h b/src/cmumble.h
index 63e3ffc..fb9afde 100644
--- a/src/cmumble.h
+++ b/src/cmumble.h
@@ -14,7 +14,7 @@
 #include <celt/celt_header.h>
 
 #include "mumble.pb-c.h"
-#include "message_list.h"
+#include "messages.h"
 #include "io.h"
 #include "connection.h"
 
@@ -57,16 +57,4 @@ enum udp_message_type {
 	udp_voice_celt_beta
 };
 
-enum mumble_message {
-#define MUMBLE_MSG(a,b) a,
-	MUMBLE_MSGS
-#undef MUMBLE_MSG
-};
-
-void
-send_msg(struct context *ctx, ProtobufCMessage *msg);
-
-int
-recv_msg(struct context *ctx);
-
 #endif
diff --git a/src/messages.c b/src/messages.c
index 98b53e3..253db16 100644
--- a/src/messages.c
+++ b/src/messages.c
@@ -1,3 +1,4 @@
+#include "messages.h"
 #include "cmumble.h"
 
 #define PREAMBLE_SIZE 6
diff --git a/src/messages.h b/src/messages.h
new file mode 100644
index 0000000..5d37697
--- /dev/null
+++ b/src/messages.h
@@ -0,0 +1,21 @@
+#ifndef _MESSAGES_H_
+#define _MESSAGES_H_
+
+#include "message_list.h"
+#include "mumble.pb-c.h"
+
+enum mumble_message {
+#define MUMBLE_MSG(a,b) a,
+	MUMBLE_MSGS
+#undef MUMBLE_MSG
+};
+
+struct context;
+
+void
+send_msg(struct context *ctx, ProtobufCMessage *msg);
+
+int
+recv_msg(struct context *ctx);
+
+#endif /* _MESSAGES_H_ */