aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/serialize.h8
-rw-r--r--src/uint256.h8
-rw-r--r--src/util.h22
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) \
{ \