diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-06-01 09:25:06 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-06-01 09:52:03 +0200 |
| commit | 1f6e64228a5631545d4b44e7f15789508203e499 (patch) | |
| tree | d996e9975e4bedcccf4e4feb4390f29888458eec | |
| parent | 32a9ddfc330cb146510f3e9bcd67da3bd6fb7bb7 (diff) | |
| parent | cb7a3edc3d60311752e8f76c0302ffd0a1fd0eb9 (diff) | |
| download | bitcoin-1f6e64228a5631545d4b44e7f15789508203e499.tar.xz | |
Merge pull request #4264
cb7a3ed remove dup of extern int nConnectTimeout; in netbase (Philip Kaufmann)
| -rw-r--r-- | src/netbase.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/netbase.h b/src/netbase.h index f5a64cb51f..23cfb1f158 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 { |