highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-07-05 21:24:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4264

Browse Source 
cb7a3ed remove dup of extern int nConnectTimeout; in netbase (Philip Kaufmann)
This commit is contained in:
Wladimir J. van der Laan
2014-06-01 09:25:06 +02:00
parent 32a9ddfc33 cb7a3edc3d
commit 1f6e64228a
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/netbase.h
View File

@ -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
{