LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages 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
commit 1f6e64228a
No known key found for this signature in database
GPG key ID: 74810B012346C9A6
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/netbase.h
View file

@ -17,6 +17,7 @@
#include <vector> #include <vector>
extern int nConnectTimeout; extern int nConnectTimeout;
extern bool fNameLookup;
#ifdef WIN32 #ifdef WIN32
// In MSVC, this is defined as a macro, undefine it to prevent a compile and link error // 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, NET_MAX,
}; };
extern int nConnectTimeout;
extern bool fNameLookup;
/** IP address (IPv6, or IPv4 using mapped IPv6 range (::FFFF:0:0/96)) */ /** IP address (IPv6, or IPv4 using mapped IPv6 range (::FFFF:0:0/96)) */
class CNetAddr class CNetAddr
{ {