From bde280b9a4da2652716c8ffdeed9ebfa4461cc70 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
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/script.h | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'src/script.h')

diff --git a/src/script.h b/src/script.h
index e3c6b15b6d..b671e15963 100644
--- a/src/script.h
+++ b/src/script.h
@@ -5,8 +5,6 @@
 #ifndef H_BITCOIN_SCRIPT
 #define H_BITCOIN_SCRIPT
 
-#include <stdint.h>
-
 #include "base58.h"
 
 #include <string>
@@ -221,7 +219,7 @@ inline std::string StackString(const std::vector<std::vector<unsigned char> >& v
 class CScript : public std::vector<unsigned char>
 {
 protected:
-    CScript& push_int64(int64_t n)
+    CScript& push_int64(int64 n)
     {
         if (n == -1 || (n >= 1 && n <= 16))
         {
@@ -235,7 +233,7 @@ protected:
         return *this;
     }
 
-    CScript& push_uint64(uint64_t n)
+    CScript& push_uint64(uint64 n)
     {
         if (n >= 1 && n <= 16)
         {
@@ -275,12 +273,12 @@ public:
     explicit CScript(short b)          { operator<<(b); }
     explicit CScript(int b)            { operator<<(b); }
     explicit CScript(long b)           { operator<<(b); }
-    explicit CScript(int64_t b)        { operator<<(b); }
+    explicit CScript(int64 b)          { operator<<(b); }
     explicit CScript(unsigned char b)  { operator<<(b); }
     explicit CScript(unsigned int b)   { operator<<(b); }
     explicit CScript(unsigned short b) { operator<<(b); }
     explicit CScript(unsigned long b)  { operator<<(b); }
-    explicit CScript(uint64_t b)       { operator<<(b); }
+    explicit CScript(uint64 b)         { operator<<(b); }
 
     explicit CScript(opcodetype b)     { operator<<(b); }
     explicit CScript(const uint256& b) { operator<<(b); }
@@ -292,12 +290,12 @@ public:
     CScript& operator<<(short b)          { return push_int64(b); }
     CScript& operator<<(int b)            { return push_int64(b); }
     CScript& operator<<(long b)           { return push_int64(b); }
-    CScript& operator<<(int64_t b)        { return push_int64(b); }
+    CScript& operator<<(int64 b)          { return push_int64(b); }
     CScript& operator<<(unsigned char b)  { return push_uint64(b); }
     CScript& operator<<(unsigned int b)   { return push_uint64(b); }
     CScript& operator<<(unsigned short b) { return push_uint64(b); }
     CScript& operator<<(unsigned long b)  { return push_uint64(b); }
-    CScript& operator<<(uint64_t b)       { return push_uint64(b); }
+    CScript& operator<<(uint64 b)         { return push_uint64(b); }
 
     CScript& operator<<(opcodetype opcode)
     {
-- 
cgit v1.2.3