aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Kaufmann <phil.kaufmann@t-online.de>2013-09-25 15:45:46 +0200
committerPhilip Kaufmann <phil.kaufmann@t-online.de>2013-09-25 15:48:11 +0200
commit8d750f1d21d8578794a765415fe9d0e9e74d2852 (patch)
tree7d3aa58111f2deba8f6de49234fd68892a5bb06c
parentd14b86730b22db92df3c1cec89bc43d20a12a898 (diff)
internal miner: move 2 globals from main to miner
- moves 2 global variables from main.cpp/h to miner.cpp/h - also removes 2 unneded includes in miner.cpp, that come from miner.h already
-rw-r--r--src/main.cpp3
-rw-r--r--src/main.h2
-rw-r--r--src/miner.cpp8
-rw-r--r--src/miner.h3
4 files changed, 5 insertions, 11 deletions
diff --git a/src/main.cpp b/src/main.cpp
index f44a58d597..dc690111e6 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -67,9 +67,6 @@ CScript COINBASE_FLAGS;
const string strMessageMagic = "Bitcoin Signed Message:\n";
-double dHashesPerSec = 0.0;
-int64 nHPSTimerStart = 0;
-
// Settings
int64 nTransactionFee = 0;
diff --git a/src/main.h b/src/main.h
index 25a6d42272..83b0d07f63 100644
--- a/src/main.h
+++ b/src/main.h
@@ -86,8 +86,6 @@ extern unsigned int nTransactionsUpdated;
extern uint64 nLastBlockTx;
extern uint64 nLastBlockSize;
extern const std::string strMessageMagic;
-extern double dHashesPerSec;
-extern int64 nHPSTimerStart;
extern int64 nTimeBestReceived;
extern CCriticalSection cs_setpwalletRegistered;
extern std::set<CWallet*> setpwalletRegistered;
diff --git a/src/miner.cpp b/src/miner.cpp
index 5f79fedba2..30c600071f 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -3,15 +3,11 @@
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
-#include "core.h"
-#include "wallet.h"
#include "miner.h"
#include "main.h"
-
-
-
-
+double dHashesPerSec = 0.0;
+int64 nHPSTimerStart = 0;
//////////////////////////////////////////////////////////////////////////////
//
diff --git a/src/miner.h b/src/miner.h
index 36d58be00f..7e60b9e53b 100644
--- a/src/miner.h
+++ b/src/miner.h
@@ -22,4 +22,7 @@ bool CheckWork(CBlock* pblock, CWallet& wallet, CReserveKey& reservekey);
/** Base sha256 mining transform */
void SHA256Transform(void* pstate, void* pinput, const void* pinit);
+extern double dHashesPerSec;
+extern int64 nHPSTimerStart;
+
#endif // BITCOIN_MINER_H