From 248a14477c435ef28b71df42080ec931b1003e3f Mon Sep 17 00:00:00 2001 From: danieldg Date: Tue, 1 Sep 2009 15:08:09 +0000 Subject: Remove unneeded #ifdef IPV6 lines git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11582 e03df62e-2008-0410-955e-edbf42e46eb7 --- include/dns.h | 3 +-- include/inspsocket.h | 2 +- include/modules.h | 14 ++------------ 3 files changed, 4 insertions(+), 15 deletions(-) (limited to 'include') diff --git a/include/dns.h b/include/dns.h index 3682bbe1d..a780505d0 100644 --- a/include/dns.h +++ b/include/dns.h @@ -358,12 +358,11 @@ class CoreExport DNS : public EventHandler */ int socketfamily; -#ifdef IPV6 /** * IPV6 server address */ in6_addr myserver6; -#endif + /** * IPV4 server address */ diff --git a/include/inspsocket.h b/include/inspsocket.h index 66ea48eb3..32f2dab1a 100644 --- a/include/inspsocket.h +++ b/include/inspsocket.h @@ -173,7 +173,7 @@ class CoreExport BufferedSocket : public EventHandler /** (really) Try bind to a given IP setup. For internal use only. */ - bool DoBindMagic(const std::string ¤t_ip, bool v6); + bool DoBindMagic(const std::string ¤t_ip); /** * The default constructor does nothing diff --git a/include/modules.h b/include/modules.h index 932ef3d19..f6678e931 100644 --- a/include/modules.h +++ b/include/modules.h @@ -76,18 +76,8 @@ enum MessageType { MSG_NOTICE = 1 }; -/** If you change the module API, change this value. - * If you have enabled ipv6, the sizes of structs is - * different, and modules will be incompatible with - * ipv4 servers, so this value will be ten times as - * high on ipv6 servers. - */ -#define NATIVE_API_VERSION 12000 -#ifdef IPV6 -#define API_VERSION (NATIVE_API_VERSION * 10) -#else -#define API_VERSION (NATIVE_API_VERSION * 1) -#endif +/** If you change the module API, change this value. */ +#define API_VERSION 13000 class ServerConfig; -- cgit v1.2.3