aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorWladimir J. van der Laan <[email protected]>2014-06-01 09:25:06 +0200
committerWladimir J. van der Laan <[email protected]>2014-06-01 09:52:03 +0200
commit1f6e64228a5631545d4b44e7f15789508203e499 (patch)
treed996e9975e4bedcccf4e4feb4390f29888458eec /src
parentMerge pull request #4218 (diff)
parentremove dup of extern int nConnectTimeout; in netbase (diff)
downloaddiscoin-1f6e64228a5631545d4b44e7f15789508203e499.tar.xz
discoin-1f6e64228a5631545d4b44e7f15789508203e499.zip
Merge pull request #4264
cb7a3ed remove dup of extern int nConnectTimeout; in netbase (Philip Kaufmann)
Diffstat (limited to 'src')
-rw-r--r--src/netbase.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/netbase.h b/src/netbase.h
index f5a64cb51..23cfb1f15 100644
--- a/src/netbase.h
+++ b/src/netbase.h
@@ -17,6 +17,7 @@
#include <vector>
extern int nConnectTimeout;
+extern bool fNameLookup;
#ifdef WIN32
// In MSVC, this is defined as a macro, undefine it to prevent a compile and link error
@@ -33,9 +34,6 @@ enum Network
NET_MAX,
};
-extern int nConnectTimeout;
-extern bool fNameLookup;
-
/** IP address (IPv6, or IPv4 using mapped IPv6 range (::FFFF:0:0/96)) */
class CNetAddr
{