From db6b03137db57c88cf53978216b40b88bdcd7d35 Mon Sep 17 00:00:00 2001
From: William Pitcock <nenolod@atheme.org>
Date: Tue, 1 Apr 2008 15:14:08 -0500
Subject: [PATCH] bork bork bork

---
 include/ircd_defs.h | 13 -------------
 include/stdinc.h    |  2 +-
 modules/Makefile.in |  2 +-
 src/ircd.c          |  2 ++
 4 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/include/ircd_defs.h b/include/ircd_defs.h
index 311b9a6..7105a99 100644
--- a/include/ircd_defs.h
+++ b/include/ircd_defs.h
@@ -169,17 +169,4 @@
 #define PATRICIA_BITS	32
 #endif
 
-#ifdef SOCKADDR_IN_HAS_LEN
-#define SET_SS_LEN(x, y) (x).ss_len = (y)
-#define GET_SS_LEN(x) x.ss_len
-#else
-#define SET_SS_LEN(x, y)
-#ifdef IPV6
-#define GET_SS_LEN(x) x.ss_family == AF_INET ? sizeof(struct sockaddr_in) : sizeof(struct sockaddr_in6)
-#else
-#define GET_SS_LEN(x) sizeof(struct sockaddr_in)
-#endif
-#endif
-
-
 #endif /* INCLUDED_ircd_defs_h */
diff --git a/include/stdinc.h b/include/stdinc.h
index ddf881a..2f8311d 100644
--- a/include/stdinc.h
+++ b/include/stdinc.h
@@ -23,7 +23,7 @@
  *
  */
 
-
+#include "ratbox_lib.h"
 #include "config.h"		/* Gotta pull in the autoconf stuff */
 
 /* AIX requires this to be the first thing in the file.  */
diff --git a/modules/Makefile.in b/modules/Makefile.in
index 8426792..5d840d7 100644
--- a/modules/Makefile.in
+++ b/modules/Makefile.in
@@ -32,7 +32,7 @@ moduledir       = @moduledir@
 # Change this later! -- adrian
 automoduledir   = @moduledir@/autoload
 
-INCLUDES	= -I../include -I../libcharybdis -I../adns $(SSL_INCLUDES)
+INCLUDES	= -I../include -I../libcharybdis -I../libratbox/include $(SSL_INCLUDES)
 CPPFLAGS	= ${INCLUDES} @CPPFLAGS@
 
 CORE_SRCS = \
diff --git a/src/ircd.c b/src/ircd.c
index 40993b1..ff675e7 100644
--- a/src/ircd.c
+++ b/src/ircd.c
@@ -73,6 +73,8 @@
 #include "patchlevel.h"
 #include "serno.h"
 
+#include "ratbox_lib.h"
+
 /*
  * Try and find the correct name to use with getrlimit() for setting the max.
  * number of files allowed to be open by this process.