X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fuint256.h;h=d3da1f26d27eb915213e000a6fe5f8ec587c43a1;hb=bde280b9a4da2652716c8ffdeed9ebfa4461cc70;hp=3e20201387b5d76a0d00e006076e2fb1bfe380ac;hpb=b2120e223a9a2282b26080cb126db9aad95b1282;p=novacoin.git

diff --git a/src/uint256.h b/src/uint256.h
index 3e20201..d3da1f2 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);
@@ -364,19 +356,19 @@ public:
     }
 
 
-    unsigned int GetSerializeSize(int nType=0, int nVersion=VERSION) const
+    unsigned int GetSerializeSize(int nType=0, int nVersion=PROTOCOL_VERSION) const
     {
         return sizeof(pn);
     }
 
     template<typename Stream>
-    void Serialize(Stream& s, int nType=0, int nVersion=VERSION) const
+    void Serialize(Stream& s, int nType=0, int nVersion=PROTOCOL_VERSION) const
     {
         s.write((char*)pn, sizeof(pn));
     }
 
     template<typename Stream>
-    void Unserialize(Stream& s, int nType=0, int nVersion=VERSION)
+    void Unserialize(Stream& s, int nType=0, int nVersion=PROTOCOL_VERSION)
     {
         s.read((char*)pn, sizeof(pn));
     }