Merge pull request #4264

cb7a3ed remove dup of extern int nConnectTimeout; in netbase (Philip Kaufmann)
2014-06-01 09:25:06 +02:00 · 2014-06-01 09:25:06 +02:00 · 1f6e64228a
parent 32a9ddfc33 cb7a3edc3d
commit 1f6e64228a
1 changed files with 1 additions and 3 deletions
--- 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
 {