And the bit I missed... :/

[user/henk/code/inspircd.git] / include / inspircd.h

diff --git a/include/inspircd.h b/include/inspircd.h
index 56fe5678b0b5500772318c2b234d8e0b5969efc2..822be147e430cd1340162175301f7f9557c62e28 100644 (file)
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -37,6 +37,7 @@
 #include <arpa/inet.h>
 #include <string>
 #include <deque>
+#include <sstream>
 
 #include "inspircd_io.h"
 #include "users.h"
@@ -47,32 +48,25 @@
 #include "command_parse.h"
 
 // some misc defines
-
 #define ERROR -1
-#define TRUE 1
-#define FALSE 0
-#define MAXSOCKS 64
 #define MAXCOMMAND 32
 
 // crucial defines
 #define ETIREDGERBILS EAGAIN
 
-/*
-flags for use with WriteMode
-
-#define WM_AND 1
-#define WM_OR 2
+// This define is used in place of strcmp when we 
+// want to check if a char* string contains only one
+// letter. Pretty fast, its just two compares and an
+// addition.
+#define IS_SINGLE(x,y) ( (*x == y) && (*(x+1) == 0) )
 
-flags for use with OnUserPreMessage and OnUserPreNotice
-
-#define TYPE_USER 1
-#define TYPE_CHANNEL 2
-#define TYPE_SERVER 3
+template<typename T> inline std::string ConvToStr(const T &in)
+{
+       std::stringstream tmp;
+       if (!(tmp << in)) return std::string();
+       return tmp.str();
+}
 
-#define IS_LOCAL(x) (x->fd > -1)
-#define IS_REMOTE(x) (x->fd < 0)
-#define IS_MODULE_CREATED(x) (x->fd == FD_MAGIC_NUMBER)
-*/
 
 class serverstats
 {