diff options
author | Gavin Andresen <gavinandresen@gmail.com> | 2011-09-01 11:52:07 -0400 |
---|---|---|
committer | Gavin Andresen <gavinandresen@gmail.com> | 2011-09-01 11:52:07 -0400 |
commit | dd7868364d9a14349ff82f74fc451db5e6b6b7b9 (patch) | |
tree | ed4142635ca823364fd272a010200380b8776412 /src/main.cpp | |
parent | f662cefd8552f07548dcca9dcf84a952650fab6f (diff) | |
parent | e4dde849ae5544383703ef2d73592677e6c528ad (diff) |
Merge branch 'code-cleanup' of git://github.com/muggenhor/bitcoin
Diffstat (limited to 'src/main.cpp')
-rw-r--r-- | src/main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main.cpp b/src/main.cpp index 36fdaa72fd..d6bfc63c3c 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -22,14 +22,14 @@ set<CWallet*> setpwalletRegistered; CCriticalSection cs_main; -map<uint256, CTransaction> mapTransactions; +static map<uint256, CTransaction> mapTransactions; CCriticalSection cs_mapTransactions; unsigned int nTransactionsUpdated = 0; map<COutPoint, CInPoint> mapNextTx; map<uint256, CBlockIndex*> mapBlockIndex; uint256 hashGenesisBlock("0x000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f"); -CBigNum bnProofOfWorkLimit(~uint256(0) >> 32); +static CBigNum bnProofOfWorkLimit(~uint256(0) >> 32); const int nTotalBlocksEstimate = 140700; // Conservative estimate of total nr of blocks on main chain const int nInitialBlockThreshold = 120; // Regard blocks up until N-threshold as "initial download" CBlockIndex* pindexGenesisBlock = NULL; |