aboutsummaryrefslogtreecommitdiff
path: root/src/netbase.h
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2014-05-01 12:07:03 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2014-05-01 12:15:36 +0200
commite27c4110d9c47d30fed4b940813c9c8b82a97fbd (patch)
tree288e02bd1addb587a17cfc2c350e74d5545bb56f /src/netbase.h
parent426dc16f7b74d5dc91a947bb22acb7a3a414bb8f (diff)
downloadbitcoin-e27c4110d9c47d30fed4b940813c9c8b82a97fbd.tar.xz
Remove build-time no-IPv6 setting
The year is 2014. All supported operating systems have IPv6 support, most certainly at build time (this doesn't mean that IPv6 is configured, of course). If noone is exercising the functionality to disable it, that means it doesn't get tested, and IMO it's better to get rid of it. (it's also not used consistently in RPC/boost and Net code...)
Diffstat (limited to 'src/netbase.h')
-rw-r--r--src/netbase.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/netbase.h b/src/netbase.h
index af40aee94b..95b1795767 100644
--- a/src/netbase.h
+++ b/src/netbase.h
@@ -77,10 +77,8 @@ class CNetAddr
int GetReachabilityFrom(const CNetAddr *paddrPartner = NULL) const;
void print() const;
-#ifdef USE_IPV6
CNetAddr(const struct in6_addr& pipv6Addr);
bool GetIn6Addr(struct in6_addr* pipv6Addr) const;
-#endif
friend bool operator==(const CNetAddr& a, const CNetAddr& b);
friend bool operator!=(const CNetAddr& a, const CNetAddr& b);
@@ -121,10 +119,8 @@ class CService : public CNetAddr
std::string ToStringIPPort() const;
void print() const;
-#ifdef USE_IPV6
CService(const struct in6_addr& ipv6Addr, unsigned short port);
CService(const struct sockaddr_in6& addr);
-#endif
IMPLEMENT_SERIALIZE
(