X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fserialize.h;h=e414bd07aacfbf769c514790924217f4b3a47804;hb=35a07f8ec4abbd0f6848e53a35b9520b33085c63;hp=302766062abcd964d98dcfed6eebb6e2be744857;hpb=c18b82d5db39bff026f10694a062be2dc7048fd8;p=novacoin.git diff --git a/src/serialize.h b/src/serialize.h index 3027660..e414bd0 100644 --- 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 // 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 = 50600; static const char* pszSubVer = ""; static const bool VERSION_IS_BETA = true; @@ -1244,8 +1245,6 @@ public: int nType; int nVersion; - typedef FILE element_type; - CAutoFile(FILE* filenew=NULL, int nTypeIn=SER_DISK, int nVersionIn=VERSION) { file = filenew;