diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2011-12-19 16:27:15 -0500 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2011-12-19 19:10:34 -0500 |
| commit | bd846c0e565ca0db276cb6b7eac7763bebe19b84 (patch) | |
| tree | 90500a69598a62954868910e64d0a77732389c2f | |
| parent | 3528650560a2c417da2303869c743da019defc6d (diff) | |
| download | bitcoin-bd846c0e565ca0db276cb6b7eac7763bebe19b84.tar.xz | |
Cleanup: removed dead code, and use C99 typedefs for int64 (supported by all modern c++ compilers)
| -rw-r--r-- | src/serialize.h | 8 | ||||
| -rw-r--r-- | src/uint256.h | 8 | ||||
| -rw-r--r-- | src/util.h | 22 |
3 files changed, 1 insertions, 37 deletions
diff --git a/src/serialize.h b/src/serialize.h index d3f6b7d703..df060fdd77 100644 --- a/src/serialize.h +++ b/src/serialize.h @@ -19,16 +19,8 @@ #include <boost/tuple/tuple_comparison.hpp> #include <boost/tuple/tuple_io.hpp> -#if defined(_MSC_VER) || defined(__BORLANDC__) -typedef __int64 int64; -typedef unsigned __int64 uint64; -#else typedef long long int64; typedef unsigned long long uint64; -#endif -#if defined(_MSC_VER) && _MSC_VER < 1300 -#define for if (false) ; else for -#endif #ifdef WIN32 #include <windows.h> diff --git a/src/uint256.h b/src/uint256.h index b6132822c5..d3da1f26d2 100644 --- a/src/uint256.h +++ b/src/uint256.h @@ -11,16 +11,8 @@ #include <string> #include <vector> -#if defined(_MSC_VER) || defined(__BORLANDC__) -typedef __int64 int64; -typedef unsigned __int64 uint64; -#else typedef long long int64; typedef unsigned long long uint64; -#endif -#if defined(_MSC_VER) && _MSC_VER < 1300 -#define for if (false) ; else for -#endif inline int Testuint256AdHoc(std::vector<std::string> vArg); diff --git a/src/util.h b/src/util.h index d9a0841a61..62b213355d 100644 --- a/src/util.h +++ b/src/util.h @@ -25,19 +25,8 @@ #include <openssl/ripemd.h> -#if defined(_MSC_VER) || defined(__BORLANDC__) -typedef __int64 int64; -typedef unsigned __int64 uint64; -#else typedef long long int64; typedef unsigned long long uint64; -#endif -#if defined(_MSC_VER) && _MSC_VER < 1300 -#define for if (false) ; else for -#endif -#ifndef _MSC_VER -#define __forceinline inline -#endif #define loop for (;;) #define BEGIN(a) ((char*)&(a)) @@ -53,7 +42,7 @@ typedef unsigned long long uint64; #define snprintf my_snprintf #ifndef PRI64d -#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__MSVCRT__) +#if defined(_MSC_VER) || defined(__MSVCRT__) #define PRI64d "I64d" #define PRI64u "I64u" #define PRI64x "I64x" @@ -474,15 +463,6 @@ inline bool GetBoolArg(const std::string& strArg) -inline void heapchk() -{ -#ifdef WIN32 - /// for debugging - //if (_heapchk() != _HEAPOK) - // DebugBreak(); -#endif -} - // Randomize the stack to help protect against buffer overrun exploits #define IMPLEMENT_RANDOMIZE_STACK(ThreadFn) \ { \ |