diff options
author | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-12-21 22:33:19 +0100 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-12-21 22:33:19 +0100 |
commit | bde280b9a4da2652716c8ffdeed9ebfa4461cc70 (patch) | |
tree | f2d96b0c74da35b701513a629817c7e944798827 /src/protocol.h | |
parent | 21d9f36781604e4ca9fc35dc65265593423b73e9 (diff) |
Revert "Use standard C99 (and Qt) types for 64-bit integers"
This reverts commit 21d9f36781604e4ca9fc35dc65265593423b73e9.
Diffstat (limited to 'src/protocol.h')
-rw-r--r-- | src/protocol.h | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/protocol.h b/src/protocol.h index 4d1b329514..53d3eef4d5 100644 --- a/src/protocol.h +++ b/src/protocol.h @@ -10,8 +10,6 @@ #ifndef __INCLUDED_PROTOCOL_H__ #define __INCLUDED_PROTOCOL_H__ -#include <stdint.h> - #include "serialize.h" #include <string> #include "uint256.h" @@ -67,12 +65,12 @@ class CAddress { public: CAddress(); - 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); + 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); void Init(); @@ -111,7 +109,7 @@ class CAddress // TODO: make private (improves encapsulation) public: - uint64_t nServices; + uint64 nServices; unsigned char pchReserved[12]; unsigned int ip; unsigned short port; |