Mercurial > hg > bitcoin
diff src/protocol.h @ 1616:997b708d15b8 draft
Revert "Use standard C99 (and Qt) types for 64-bit integers"
This reverts commit 21d9f36781604e4ca9fc35dc65265593423b73e9.
| author | Wladimir J. van der Laan <laanwj@gmail.com> |
|---|---|
| date | Wed, 21 Dec 2011 22:33:19 +0100 (2011-12-21) |
| parents | 31320aeee32b |
| children | 4a2d4c136998 |
line wrap: on
line diff
--- 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 @@ { 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 @@ // TODO: make private (improves encapsulation) public: - uint64_t nServices; + uint64 nServices; unsigned char pchReserved[12]; unsigned int ip; unsigned short port;