diff options
| author | Brandon Dahler <brandon.dahler@gmail.com> | 2013-04-13 00:13:08 -0500 |
|---|---|---|
| committer | Brandon Dahler <brandon.dahler@gmail.com> | 2013-11-10 09:36:28 -0600 |
| commit | 51ed9ec971614aebdbfbd9527aba365dd0afd437 (patch) | |
| tree | d2f910390e55aef857023812fbdaefdd66cd99ff /src/netbase.h | |
| parent | 7c4c207be8420d394a5abc4368d1bb69ad4f8067 (diff) | |
| download | bitcoin-51ed9ec971614aebdbfbd9527aba365dd0afd437.tar.xz | |
Cleanup code using forward declarations.
Use misc methods of avoiding unnecesary header includes.
Replace int typedefs with int##_t from stdint.h.
Replace PRI64[xdu] with PRI[xdu]64 from inttypes.h.
Normalize QT_VERSION ifs where possible.
Resolve some indirect dependencies as direct ones.
Remove extern declarations from .cpp files.
Diffstat (limited to 'src/netbase.h')
| -rw-r--r-- | src/netbase.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/netbase.h b/src/netbase.h index c14fa5075d..af40aee94b 100644 --- a/src/netbase.h +++ b/src/netbase.h @@ -1,6 +1,7 @@ // Copyright (c) 2009-2013 The Bitcoin developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. + #ifndef BITCOIN_NETBASE_H #define BITCOIN_NETBASE_H @@ -8,12 +9,13 @@ #include "bitcoin-config.h" #endif +#include "compat.h" +#include "serialize.h" + +#include <stdint.h> #include <string> #include <vector> -#include "serialize.h" -#include "compat.h" - extern int nConnectTimeout; #ifdef WIN32 @@ -69,7 +71,7 @@ class CNetAddr std::string ToString() const; std::string ToStringIP() const; unsigned int GetByte(int n) const; - uint64 GetHash() const; + uint64_t GetHash() const; bool GetInAddr(struct in_addr* pipv4Addr) const; std::vector<unsigned char> GetGroup() const; int GetReachabilityFrom(const CNetAddr *paddrPartner = NULL) const; |