s_log.* -> logger.* (s_foo looks ugly, lets try to get rid of it)

[solanum.git] / include / ircd_defs.h

diff --git a/include/ircd_defs.h b/include/ircd_defs.h
index 311b9a6ccb7059753cb13f5144e225691a9d8657..f9fb55dc5c4873eeebf0874996f49e3a9e4659cc 100644 (file)
--- a/include/ircd_defs.h
+++ b/include/ircd_defs.h
@@ -59,7 +59,7 @@
 #define IRC_DEPRECATED
 #endif
 
-#include "s_log.h"
+#include "logger.h"
 #include "send.h"
 
 #ifdef SOFT_ASSERT
@@ -152,34 +152,10 @@
 #endif
 #endif /* #ifdef IPV6 */
 
-
-#ifdef IPV6
-#define irc_sockaddr_storage sockaddr_storage
-#else
-#define irc_sockaddr_storage sockaddr
-#define ss_family sa_family
-#ifdef SOCKADDR_IN_HAS_LEN
-#define ss_len sa_len
-#endif
-#endif
-
 #ifdef IPV6
 #define PATRICIA_BITS  128
 #else
 #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 */