From bde280b9a4da2652716c8ffdeed9ebfa4461cc70 Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Wed, 21 Dec 2011 22:33:19 +0100 Subject: Revert "Use standard C99 (and Qt) types for 64-bit integers" This reverts commit 21d9f36781604e4ca9fc35dc65265593423b73e9. --- src/bignum.h | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'src/bignum.h') diff --git a/src/bignum.h b/src/bignum.h index baa9cb55da..135eade679 100644 --- a/src/bignum.h +++ b/src/bignum.h @@ -5,8 +5,6 @@ #ifndef BITCOIN_BIGNUM_H #define BITCOIN_BIGNUM_H -#include - #include #include #include @@ -83,12 +81,12 @@ public: CBigNum(short n) { BN_init(this); if (n >= 0) setulong(n); else setint64(n); } CBigNum(int n) { BN_init(this); if (n >= 0) setulong(n); else setint64(n); } CBigNum(long n) { BN_init(this); if (n >= 0) setulong(n); else setint64(n); } - CBigNum(int64_t n) { BN_init(this); setint64(n); } + CBigNum(int64 n) { BN_init(this); setint64(n); } CBigNum(unsigned char n) { BN_init(this); setulong(n); } CBigNum(unsigned short n) { BN_init(this); setulong(n); } CBigNum(unsigned int n) { BN_init(this); setulong(n); } CBigNum(unsigned long n) { BN_init(this); setulong(n); } - CBigNum(uint64_t n) { BN_init(this); setuint64(n); } + CBigNum(uint64 n) { BN_init(this); setuint64(n); } explicit CBigNum(uint256 n) { BN_init(this); setuint256(n); } explicit CBigNum(const std::vector& vch) @@ -122,12 +120,12 @@ public: return (n > std::numeric_limits::max() ? std::numeric_limits::min() : -(int)n); } - void setint64(int64_t n) + void setint64(int64 n) { unsigned char pch[sizeof(n) + 6]; unsigned char* p = pch + 4; bool fNegative = false; - if (n < (int64_t)0) + if (n < (int64)0) { n = -n; fNegative = true; @@ -157,7 +155,7 @@ public: BN_mpi2bn(pch, p - pch, this); } - void setuint64(uint64_t n) + void setuint64(uint64 n) { unsigned char pch[sizeof(n) + 6]; unsigned char* p = pch + 4; -- cgit v1.2.3