Merge branch '0.4.x' into 0.5.x

[novacoin.git] / src / serialize.h

diff --git a/src/serialize.h b/src/serialize.h
index 959a3a6..6bdf378 100644 (file)
--- a/src/serialize.h
+++ b/src/serialize.h
@@ -30,7 +30,8 @@ typedef unsigned long long  uint64;
 #define for  if (false) ; else for
 #endif
 
-#ifdef __WXMSW__
+#ifdef WIN32
+#include <windows.h>
 // This is used to attempt to keep keying material out of swap
 // Note that VirtualLock does not provide this as a guarantee on Windows,
 // but, in practice, memory that has been VirtualLock'd almost never gets written to
@@ -59,7 +60,7 @@ class CDataStream;
 class CAutoFile;
 static const unsigned int MAX_SIZE = 0x02000000;
 
-static const int VERSION = 40600;
+static const int VERSION = 50500;
 static const char* pszSubVer = "";
 static const bool VERSION_IS_BETA = true;