diff -uNr a/bitcoin/src/main.cpp b/bitcoin/src/main.cpp --- a/bitcoin/src/main.cpp 02ccc72e42939509fc180861db7ffec50563a84869f35671fcf720090f9782674edcc89c4174175691566fac7277f1ebe0f50253d1e4a995eb960f5b43cce2a3 +++ b/bitcoin/src/main.cpp 0ccb0c29c0a3217d57f9bc72d87b497e64116a9f79e69277408750ee3dc95738ce52a70afece7a1054314100d84f93f6525ab514b8abd8ce78ab8ebd50e599a2 @@ -17,6 +17,8 @@ // Global state // +int VERSION = DEFAULT_CLIENT_VERSION; + CCriticalSection cs_setpwalletRegistered; set setpwalletRegistered; diff -uNr a/bitcoin/src/serialize.h b/bitcoin/src/serialize.h --- a/bitcoin/src/serialize.h 3b61e200efe4b17a7f5384e13ab2a1a5e0a74fce0a097802d5e32bb5d74f88fa6e018f56c36ca9198d726a3a78168f87a6181d498cb7a388bc1f3adefa7cd93f +++ b/bitcoin/src/serialize.h ef93153b01fdf024a0ab2ce0f992ea9af50d3423baa147c395bba4cc90575bda0d832c0313428bbbc837c99d549c4ba787b94fad5b871870397a410ba59ea0e9 @@ -44,7 +44,7 @@ class CAutoFile; static const unsigned int MAX_SIZE = 0x02000000; -static int VERSION = DEFAULT_CLIENT_VERSION; +extern int VERSION; // Used to bypass the rule against non-const reference to temporary // where it makes sense with wrappers such as CFlatData or CTxDB