--- a/trb dd023cc1f861ddc38a74d693eac92721bda2e102f6fa625e199ebf91f5b5ee474abab1d662b9bf0f30d6d14b1ce9a7e1a34e80069ba39e238cfd633b89bd2a52 +++ b/trb ea3bff957a593cf36b6458aa69a2bb0bc89f2e73474f5bbf35ffe4ee57098ab03fbe74a238e4b342d30ad4ac6b1cfe736cecc1af21c3d278d1d37d5c01379742 @@ -6998,7 +6998,7 @@ #endif // __INCLUDED_PROTOCOL_H__ ############################################################################## -82812 @ ./bitcoin/src/bitcoinrpc.cpp +82826 @ ./bitcoin/src/bitcoinrpc.cpp ############################################################################## // Copyright (c) 2010 Satoshi Nakamoto // Copyright (c) 2009-2012 The Bitcoin developers @@ -8760,8 +8760,8 @@ result.push_back(Pair("version", pblock->nVersion)); result.push_back(Pair("previousblockhash", pblock->hashPrevBlock.GetHex())); result.push_back(Pair("transactions", transactions)); - result.push_back(Pair("coinbasevalue", (int64_t)pblock->vtx[0].vout[0].nValue)); - result.push_back(Pair("time", (int64_t)pblock->nTime)); + result.push_back(Pair("coinbasevalue", (boost::int64_t)pblock->vtx[0].vout[0].nValue)); + result.push_back(Pair("time", (boost::int64_t)pblock->nTime)); union { int32_t nBits; @@ -19662,7 +19662,7 @@ } ############################################################################## -17609 @ ./bitcoin/src/util.h +17628 @ ./bitcoin/src/util.h ############################################################################## // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2012 The Bitcoin developers @@ -19673,7 +19673,7 @@ #include "uint256.h" - +#include #include #include #include