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 --- src/modules/m_spanningtree/main.cpp | 2 -- src/modules/m_spanningtree/utils.cpp | 8 -------- 2 files changed, 10 deletions(-) (limited to 'src/modules') diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp index 94f084125..9e8fa7035 100644 --- a/src/modules/m_spanningtree/main.cpp +++ b/src/modules/m_spanningtree/main.cpp @@ -259,7 +259,6 @@ void ModuleSpanningTree::ConnectServer(Link* x) } QueryType start_type = DNS_QUERY_A; -#ifdef IPV6 start_type = DNS_QUERY_AAAA; if (strchr(x->IPAddr.c_str(),':')) { @@ -268,7 +267,6 @@ void ModuleSpanningTree::ConnectServer(Link* x) ipvalid = false; } else -#endif { in_addr n; if (inet_aton(x->IPAddr.c_str(),&n) < 1) diff --git a/src/modules/m_spanningtree/utils.cpp b/src/modules/m_spanningtree/utils.cpp index ee12712b8..e527cd2da 100644 --- a/src/modules/m_spanningtree/utils.cpp +++ b/src/modules/m_spanningtree/utils.cpp @@ -405,7 +405,6 @@ void SpanningTreeUtilities::RefreshIPCache() /* Needs resolving */ bool ipvalid = true; QueryType start_type = DNS_QUERY_A; -#ifdef IPV6 start_type = DNS_QUERY_AAAA; if (strchr(L->IPAddr.c_str(),':')) { @@ -414,7 +413,6 @@ void SpanningTreeUtilities::RefreshIPCache() ipvalid = false; } else -#endif { in_addr n; if (inet_aton(L->IPAddr.c_str(),&n) < 1) @@ -571,7 +569,6 @@ void SpanningTreeUtilities::ReadConfiguration(bool rebind) /* Needs resolving */ bool ipvalid = true; QueryType start_type = DNS_QUERY_A; -#ifdef IPV6 start_type = DNS_QUERY_AAAA; if (strchr(L.IPAddr.c_str(),':')) { @@ -585,11 +582,6 @@ void SpanningTreeUtilities::ReadConfiguration(bool rebind) if (inet_aton(L.IPAddr.c_str(),&n) < 1) ipvalid = false; } -#else - in_addr n; - if (inet_aton(L.IPAddr.c_str(),&n) < 1) - ipvalid = false; -#endif if (!ipvalid) { -- cgit v1.2.3