diff options
| author | Luke Dashjr <[email protected]> | 2011-12-20 16:52:59 -0500 |
|---|---|---|
| committer | Luke Dashjr <[email protected]> | 2011-12-20 16:52:59 -0500 |
| commit | 21d9f36781604e4ca9fc35dc65265593423b73e9 (patch) | |
| tree | 223bf70418e43a0b9c8366c65db214780f77d61a /src/protocol.h | |
| parent | Merge pull request #677 from luke-jr/minfee_modes (diff) | |
| download | discoin-21d9f36781604e4ca9fc35dc65265593423b73e9.tar.xz discoin-21d9f36781604e4ca9fc35dc65265593423b73e9.zip | |
Use standard C99 (and Qt) types for 64-bit integers
Diffstat (limited to 'src/protocol.h')
| -rw-r--r-- | src/protocol.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/protocol.h b/src/protocol.h index 53d3eef4d..4d1b32951 100644 --- a/src/protocol.h +++ b/src/protocol.h @@ -10,6 +10,8 @@ #ifndef __INCLUDED_PROTOCOL_H__ #define __INCLUDED_PROTOCOL_H__ +#include <stdint.h> + #include "serialize.h" #include <string> #include "uint256.h" @@ -65,12 +67,12 @@ class CAddress { public: CAddress(); - CAddress(unsigned int ipIn, unsigned short portIn=0, uint64 nServicesIn=NODE_NETWORK); - explicit CAddress(const struct sockaddr_in& sockaddr, uint64 nServicesIn=NODE_NETWORK); - explicit CAddress(const char* pszIn, int portIn, bool fNameLookup = false, uint64 nServicesIn=NODE_NETWORK); - explicit CAddress(const char* pszIn, bool fNameLookup = false, uint64 nServicesIn=NODE_NETWORK); - explicit CAddress(std::string strIn, int portIn, bool fNameLookup = false, uint64 nServicesIn=NODE_NETWORK); - explicit CAddress(std::string strIn, bool fNameLookup = false, uint64 nServicesIn=NODE_NETWORK); + CAddress(unsigned int ipIn, unsigned short portIn=0, uint64_t nServicesIn=NODE_NETWORK); + explicit CAddress(const struct sockaddr_in& sockaddr, uint64_t nServicesIn=NODE_NETWORK); + explicit CAddress(const char* pszIn, int portIn, bool fNameLookup = false, uint64_t nServicesIn=NODE_NETWORK); + explicit CAddress(const char* pszIn, bool fNameLookup = false, uint64_t nServicesIn=NODE_NETWORK); + explicit CAddress(std::string strIn, int portIn, bool fNameLookup = false, uint64_t nServicesIn=NODE_NETWORK); + explicit CAddress(std::string strIn, bool fNameLookup = false, uint64_t nServicesIn=NODE_NETWORK); void Init(); @@ -109,7 +111,7 @@ class CAddress // TODO: make private (improves encapsulation) public: - uint64 nServices; + uint64_t nServices; unsigned char pchReserved[12]; unsigned int ip; unsigned short port; |