Replace SNIRCD macros with SNIRCD_VERSION.

--HG--
branch : shroudtrusts

diff --git a/glines/glines.h b/glines/glines.h
index 42ea8c8367a68f63dd734ec2c0f9533d8ab1e0e0..6fb1bf28e9adfc01c92e2ee02759f5cd041459fb 100644 (file)
--- a/glines/glines.h
+++ b/glines/glines.h
@@ -5,8 +5,7 @@
 #include "../nick/nick.h"
 #include "../channel/channel.h"
 
-#define SNIRCD_13
-#undef SNIRCD_14
+#define SNIRCD_VERSION 134
 
 #define MAXUSERGLINEUSERHITS        100
 #define MAXUSERGLINECHANNELHITS     10

diff --git a/glines/glines_commands.c b/glines/glines_commands.c
index 2805b5a9264cb31aa7f2ef6d5a8a85550075d0b5..5c48a62a85e2767ab7cc2066b6b9e3af229f21ec 100644 (file)
--- a/glines/glines_commands.c
+++ b/glines/glines_commands.c
@@ -75,7 +75,7 @@ static int glines_gline_helper(void *source, int cargc, char **cargv, int sanity
   char *mask, *reason;
   char creator[32];
   glinebuf gbuf;
-#ifdef SNIRCD_13
+#if SNIRCD_VERSION <= 134
   gline *gl;
 #endif
 
@@ -103,11 +103,11 @@ static int glines_gline_helper(void *source, int cargc, char **cargv, int sanity
     return CMD_ERROR;
   }
 
-#ifdef SNIRCD_13
+#if SNIRCD_VERSION <= 134
   gl = findgline(mask);
 
   if (gl) {
-     /* snircd 1.3:  warn opers that they can't modify this gline */
+     /* warn opers that they can't modify this gline */
     if (gl->flags & GLINE_ACTIVE) {
       controlreply(sender, "Active G-Line already exists on %s - unable to modify", cargv[0]);
       return CMD_ERROR;