irc_string.h -> match.h, irc_string.h; includes changed

[solanum.git] / include / client.h

diff --git a/include/client.h b/include/client.h
index e44932e9ae451d14b1e187295c383119f4fba4f6..1b934e76480d0214744f397fd0a33d40cf055fa8 100644 (file)
--- a/include/client.h
+++ b/include/client.h
@@ -38,8 +38,7 @@
 #include "channel.h"
 #include "res.h"
 #include "snomask.h"
-#include "irc_string.h"
-#include "sprintf_irc.h"
+#include "match.h"
 #include "ircd.h"
 
 /* other structs */
@@ -111,11 +110,11 @@ struct Server
 
 struct ZipStats
 {
-       unsigned long long in;\r
-       unsigned long long in_wire;\r
-       unsigned long long out;\r
-       unsigned long long out_wire;\r
-       double in_ratio;\r
+       unsigned long long in;
+       unsigned long long in_wire;
+       unsigned long long out;
+       unsigned long long out_wire;
+       double in_ratio;
        double out_ratio;
 };
 
@@ -441,9 +440,8 @@ struct exit_client_hook
 /* overflow flags */
 /* EARLIER FLAGS ARE IN s_newconf.h */
 #define FLAGS2_EXEMPTRESV      0x00400000
-#define FLAGS2_EXEMPTGLINE      0x00800000
-#define FLAGS2_EXEMPTKLINE      0x01000000
-#define FLAGS2_EXEMPTFLOOD      0x02000000
+#define FLAGS2_EXEMPTKLINE      0x00800000
+#define FLAGS2_EXEMPTFLOOD      0x01000000
 #define FLAGS2_IP_SPOOFING      0x10000000
 #define FLAGS2_EXEMPTSPAMBOT   0x20000000
 #define FLAGS2_EXEMPTSHIDE     0x40000000
@@ -537,8 +535,6 @@ struct exit_client_hook
  */
 #define IsExemptKline(x)        ((x)->flags2 & FLAGS2_EXEMPTKLINE)
 #define SetExemptKline(x)       ((x)->flags2 |= FLAGS2_EXEMPTKLINE)
-#define IsExemptGline(x)        ((x)->flags2 & FLAGS2_EXEMPTGLINE)
-#define SetExemptGline(x)       ((x)->flags2 |= FLAGS2_EXEMPTGLINE)
 #define IsExemptFlood(x)        ((x)->flags2 & FLAGS2_EXEMPTFLOOD)
 #define SetExemptFlood(x)       ((x)->flags2 |= FLAGS2_EXEMPTFLOOD)
 #define IsExemptSpambot(x)     ((x)->flags2 & FLAGS2_EXEMPTSPAMBOT)
@@ -573,7 +569,6 @@ struct exit_client_hook
 extern void check_banned_lines(void);
 extern void check_klines_event(void *unused);
 extern void check_klines(void);
-extern void check_glines(void);
 extern void check_dlines(void);
 extern void check_xlines(void);