Moved a ton of defined to modules.h that belong there

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@2524 e03df62e-2008-0410-955e-edbf42e46eb7

3 files changed, 19 insertions, 5 deletions

diff --git a/include/inspircd.h b/include/inspircd.h
index 75446aa36..1d98ad610 100644
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -53,12 +53,13 @@
 #define MAXSOCKS 64
 #define MAXCOMMAND 32
 
-// flags for use with WriteMode
+/*
+flags for use with WriteMode
 
 #define WM_AND 1
 #define WM_OR 2
 
-// flags for use with OnUserPreMessage and OnUserPreNotice
+flags for use with OnUserPreMessage and OnUserPreNotice
 
 #define TYPE_USER 1
 #define TYPE_CHANNEL 2
@@ -67,8 +68,7 @@
 #define IS_LOCAL(x) (x->fd > -1)
 #define IS_REMOTE(x) (x->fd < 0)
 #define IS_MODULE_CREATED(x) (x->fd == FD_MAGIC_NUMBER)
-
-/*typedef void (handlerfunc) (char**, int, userrec*);*/
+*/
 
 class serverstats
 {
diff --git a/include/modules.h b/include/modules.h
index b86576296..5e985b8bb 100644
--- a/include/modules.h
+++ b/include/modules.h
@@ -101,6 +101,17 @@ typedef std::deque<userrec*> chanuserlist;
 
 #define FD_MAGIC_NUMBER -42
 
+// flags for use with WriteMode
+
+#define WM_AND 1
+#define WM_OR 2
+
+// flags for use with OnUserPreMessage and OnUserPreNotice
+
+#define TYPE_USER 1
+#define TYPE_CHANNEL 2
+#define TYPE_SERVER 3
+
 /*extern void createcommand(char* cmd, handlerfunc f, char flags, int minparams, char* source);
 extern void server_mode(char **parameters, int pcnt, userrec *user);*/
 
diff --git a/src/modules/m_cloaking.cpp b/src/modules/m_cloaking.cpp
index d7f4082ee..7bcfb0af2 100644
--- a/src/modules/m_cloaking.cpp
+++ b/src/modules/m_cloaking.cpp
@@ -29,7 +29,10 @@ using namespace std;
 // the server->server link, and all encoding of hosts is
 // done locally on the server by this module.
 
-#include <stdio.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
 #include "users.h"
 #include "channels.h"
 #include "modules.h"