replacing ssld with servlink

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

diff --git a/include/ircd_defs.h b/include/ircd_defs.h
index fc1d3bd41ac740646b0567fddfee9c322427b40f..f5c359f6d5c11a6bb2994211ab9b2ba69009ae20 100644 (file)
--- a/include/ircd_defs.h
+++ b/include/ircd_defs.h
@@ -22,7 +22,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: ircd_defs.h 3225 2007-03-04 23:42:55Z jilles $
+ *  $Id: ircd_defs.h 3512 2007-06-06 16:20:40Z nenolod $
  */
 
 /*
@@ -30,10 +30,11 @@
  * Otherwise there are no user servicable part here. 
  *
  */
- /* ircd_defs.h - Global size definitions for record entries used
-  * througout ircd. Please think 3 times before adding anything to this
-  * file.
-  */
+
+/* ircd_defs.h - Global size definitions for record entries used
+ * througout ircd. Please think 3 times before adding anything to this
+ * file.
+ */
 #ifndef INCLUDED_ircd_defs_h
 #define INCLUDED_ircd_defs_h
 
@@ -48,6 +49,15 @@
 #define AFP(a,b)
 #endif
 
+/*
+ * This ensures that __attribute__((deprecated)) is not used in for example
+ * sun CC, since it's a GNU-specific extension. -nenolod
+ */
+#ifdef __GNUC__
+#define IRC_DEPRECATED __attribute__((deprecated))
+#else
+#define IRC_DEPRECATED
+#endif
 
 #include "s_log.h"
 #include "send.h"
@@ -142,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 */