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.cpp | |
| parent | 21d9f36781604e4ca9fc35dc65265593423b73e9 (diff) | |
| download | bitcoin-bde280b9a4da2652716c8ffdeed9ebfa4461cc70.tar.xz | |
Revert "Use standard C99 (and Qt) types for 64-bit integers"
This reverts commit 21d9f36781604e4ca9fc35dc65265593423b73e9.
Diffstat (limited to 'src/protocol.cpp')
| -rw-r--r-- | src/protocol.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/protocol.cpp b/src/protocol.cpp index 8e588652de..27efb8f293 100644 --- a/src/protocol.cpp +++ b/src/protocol.cpp @@ -3,8 +3,6 @@ // Distributed under the MIT/X11 software license, see the accompanying // file license.txt or http://www.opensource.org/licenses/mit-license.php. -#include <stdint.h> - #include "protocol.h" #include "util.h" @@ -84,7 +82,7 @@ CAddress::CAddress() Init(); } -CAddress::CAddress(unsigned int ipIn, unsigned short portIn, uint64_t nServicesIn) +CAddress::CAddress(unsigned int ipIn, unsigned short portIn, uint64 nServicesIn) { Init(); ip = ipIn; @@ -92,7 +90,7 @@ CAddress::CAddress(unsigned int ipIn, unsigned short portIn, uint64_t nServicesI nServices = nServicesIn; } -CAddress::CAddress(const struct sockaddr_in& sockaddr, uint64_t nServicesIn) +CAddress::CAddress(const struct sockaddr_in& sockaddr, uint64 nServicesIn) { Init(); ip = sockaddr.sin_addr.s_addr; @@ -100,25 +98,25 @@ CAddress::CAddress(const struct sockaddr_in& sockaddr, uint64_t nServicesIn) nServices = nServicesIn; } -CAddress::CAddress(const char* pszIn, int portIn, bool fNameLookup, uint64_t nServicesIn) +CAddress::CAddress(const char* pszIn, int portIn, bool fNameLookup, uint64 nServicesIn) { Init(); Lookup(pszIn, *this, nServicesIn, fNameLookup, portIn); } -CAddress::CAddress(const char* pszIn, bool fNameLookup, uint64_t nServicesIn) +CAddress::CAddress(const char* pszIn, bool fNameLookup, uint64 nServicesIn) { Init(); Lookup(pszIn, *this, nServicesIn, fNameLookup, 0, true); } -CAddress::CAddress(std::string strIn, int portIn, bool fNameLookup, uint64_t nServicesIn) +CAddress::CAddress(std::string strIn, int portIn, bool fNameLookup, uint64 nServicesIn) { Init(); Lookup(strIn.c_str(), *this, nServicesIn, fNameLookup, portIn); } -CAddress::CAddress(std::string strIn, bool fNameLookup, uint64_t nServicesIn) +CAddress::CAddress(std::string strIn, bool fNameLookup, uint64 nServicesIn) { Init(); Lookup(strIn.c_str(), *this, nServicesIn, fNameLookup, 0, true); |