SVN Id removal part two

[irc/rqf/shadowircd.git] / include / ircd_defs.h

diff --git a/include/ircd_defs.h b/include/ircd_defs.h
index f5c359f6d5c11a6bb2994211ab9b2ba69009ae20..accf3d219f7f425f36f48e8dce6fbba4ceea04ab 100644 (file)
--- a/include/ircd_defs.h
+++ b/include/ircd_defs.h
@@ -22,7 +22,6 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: ircd_defs.h 3512 2007-06-06 16:20:40Z nenolod $
  */
 
 /*
@@ -59,7 +58,7 @@
 #define IRC_DEPRECATED
 #endif
 
-#include "s_log.h"
+#include "logger.h"
 #include "send.h"
 
 #ifdef SOFT_ASSERT
@@ -94,14 +93,6 @@
 #  error Incorrect config.h for this revision of ircd.
 #endif
 
-/*
- * This defines the version of the data structures used in the ircd.
- * In the event of a mismatch (i.e. this is incremented due to a major
- * change that cannot be accomidated for in the ircd), then a hard
- * restart occurs.
- */
-#define CHARYBDIS_DV   0x00010200      /* 1.2.0 */
-
 #define HOSTLEN         63     /* Length of hostname.  Updated to         */
                                /* comply with RFC1123                     */
 
@@ -116,16 +107,14 @@
  * takes at most 246 bytes (including CRLF and '\0') and together with the
  * quit reason should fit in 512 */
 #define REASONLEN      260     /* kick/part/quit */
-#define BANREASONLEN   390     /* kline/dline/gline */
+#define BANREASONLEN   390     /* kline/dline */
 #define AWAYLEN                TOPICLEN
 #define KILLLEN         200    /* with Killed (nick ()) added this should fit in quit */
 
 /* 23+1 for \0 */
 #define KEYLEN          24
 #define BUFSIZE         512    /* WARNING: *DONT* CHANGE THIS!!!! */
-#define MAXRECIPIENTS   20
-#define MAXBANLENGTH    1024
-#define OPERNICKLEN     NICKLEN*2      /* Length of OPERNICKs. */
+#define OPERNICKLEN     (NICKLEN*2)    /* Length of OPERNICKs. */
 
 #define USERHOST_REPLYLEN       (NICKLEN+HOSTLEN+USERLEN+5)
 #define MAX_DATE_STRING 32     /* maximum string length for a date string */
@@ -139,20 +128,20 @@
 #define CLIENT_PARSE_ERROR -1
 #define CLIENT_OK      1
 
-#ifdef IPV6
+#ifdef RB_IPV6
 #ifndef AF_INET6
 #error "AF_INET6 not defined"
 #endif
 
 
-#else /* #ifdef IPV6 */
+#else /* #ifdef RB_IPV6 */
 
 #ifndef AF_INET6
 #define AF_INET6 AF_MAX                /* Dummy AF_INET6 declaration */
 #endif
-#endif /* #ifdef IPV6 */
+#endif /* #ifdef RB_IPV6 */
 
-#ifdef IPV6
+#ifdef RB_IPV6
 #define PATRICIA_BITS  128
 #else
 #define PATRICIA_BITS  32