From f51b175e3c9f7326267ca0eef0dd8ae2f28b4fad Mon Sep 17 00:00:00 2001
From: Philip Kaufmann <phil.kaufmann@t-online.de>
Date: Fri, 17 Aug 2012 10:35:51 +0200
Subject: [PATCH 1/2] fix a compiler sign warning in OpenBlockFile()

---
 src/main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main.cpp b/src/main.cpp
index ef59d31f9a8..9e1b228b2ad 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1705,7 +1705,7 @@ FILE* AppendBlockFile(unsigned int& nFileRet)
         if (fseek(file, 0, SEEK_END) != 0)
             return NULL;
         // FAT32 file size max 4GB, fseek and ftell max 2GB, so we must stay under 2GB
-        if (ftell(file) < 0x7F000000 - MAX_SIZE)
+        if (ftell(file) < (long)(0x7F000000 - MAX_SIZE))
         {
             nFileRet = nCurrentBlockFile;
             return file;

From d710ed5b637ab8a4fca433b9b6d331c1e4b97908 Mon Sep 17 00:00:00 2001
From: Gavin Andresen <gavinandresen@gmail.com>
Date: Wed, 27 Jun 2012 12:43:19 -0400
Subject: [PATCH 2/2] Add CBlock::CURRENT_VERSION and
 CTransaction::CURRENT_VERSION constants.

Partial of upstream dae3e10a5abe93833c57183b7c00f1db9200f46e
---
 src/main.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main.h b/src/main.h
index 4edea5ed46e..8f9e07f7a82 100644
--- a/src/main.h
+++ b/src/main.h
@@ -396,6 +396,7 @@ typedef std::map<uint256, std::pair<CTxIndex, CTransaction> > MapPrevTx;
 class CTransaction
 {
 public:
+    static const int CURRENT_VERSION=1;
     int nVersion;
     std::vector<CTxIn> vin;
     std::vector<CTxOut> vout;
@@ -418,7 +419,7 @@ public:
 
     void SetNull()
     {
-        nVersion = 1;
+        nVersion = CTransaction::CURRENT_VERSION;
         vin.clear();
         vout.clear();
         nLockTime = 0;
@@ -830,6 +831,7 @@ class CBlock
 {
 public:
     // header
+    static const int CURRENT_VERSION=1;
     int nVersion;
     uint256 hashPrevBlock;
     uint256 hashMerkleRoot;
@@ -868,7 +870,7 @@ public:
 
     void SetNull()
     {
-        nVersion = 1;
+        nVersion = CBlock::CURRENT_VERSION;
         hashPrevBlock = 0;
         hashMerkleRoot = 0;
         nTime = 0;