Browse Source

Cleanup: removed dead code, and use C99 typedefs for int64 (supported by all modern c++ compilers)

tags/v0.15.1
Gavin Andresen 9 years ago
parent
commit
bd846c0e56
3 changed files with 1 additions and 37 deletions
  1. 0
    8
      src/serialize.h
  2. 0
    8
      src/uint256.h
  3. 1
    21
      src/util.h

+ 0
- 8
src/serialize.h View File

@@ -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>

+ 0
- 8
src/uint256.h View File

@@ -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);

+ 1
- 21
src/util.h View File

@@ -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) \
{ \

Loading…
Cancel
Save