diff options
-rw-r--r-- | contrib/homebrew/bitcoin.qt.pro.patch | 32 | ||||
-rw-r--r-- | contrib/homebrew/makefile.osx.patch | 48 | ||||
-rw-r--r-- | src/main.cpp | 3 | ||||
-rw-r--r-- | src/main.h | 2 | ||||
-rw-r--r-- | src/miner.cpp | 8 | ||||
-rw-r--r-- | src/miner.h | 3 | ||||
-rw-r--r-- | src/qt/forms/sendcoinsdialog.ui | 2 |
7 files changed, 6 insertions, 92 deletions
diff --git a/contrib/homebrew/bitcoin.qt.pro.patch b/contrib/homebrew/bitcoin.qt.pro.patch deleted file mode 100644 index 1001f29065..0000000000 --- a/contrib/homebrew/bitcoin.qt.pro.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro -index d938c07..e1dd4ec 100644 ---- a/bitcoin-qt.pro -+++ b/bitcoin-qt.pro -@@ -353,7 +353,7 @@ - } - - isEmpty(BDB_LIB_PATH) { -- macx:BDB_LIB_PATH = /opt/local/lib/db48 -+ macx:BDB_LIB_PATH = /usr/local/opt/berkeley-db4/lib - } - - isEmpty(BDB_LIB_SUFFIX) { -@@ -361,15 +361,15 @@ - } - - isEmpty(BDB_INCLUDE_PATH) { -- macx:BDB_INCLUDE_PATH = /opt/local/include/db48 -+ macx:BDB_INCLUDE_PATH = /usr/local/opt/berkeley-db4/include - } - - isEmpty(BOOST_LIB_PATH) { -- macx:BOOST_LIB_PATH = /opt/local/lib -+ macx:BOOST_LIB_PATH = /usr/local/opt/boost/lib - } - - isEmpty(BOOST_INCLUDE_PATH) { -- macx:BOOST_INCLUDE_PATH = /opt/local/include -+ macx:BOOST_INCLUDE_PATH = /usr/local/opt/boost/include - } - - win32:DEFINES += WIN32 diff --git a/contrib/homebrew/makefile.osx.patch b/contrib/homebrew/makefile.osx.patch deleted file mode 100644 index 287db2fdf2..0000000000 --- a/contrib/homebrew/makefile.osx.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/src/makefile.osx b/src/makefile.osx -index bef0ef3..07ef8d3 100644 ---- a/src/makefile.osx -+++ b/src/makefile.osx -@@ -7,17 +7,21 @@ - # Originally by Laszlo Hanyecz (solar@heliacal.net) - - CXX=llvm-g++ --DEPSDIR=/opt/local -+DEPSDIR=/usr/local -+DB4DIR=/usr/local/opt/berkeley-db4 -+OPENSSLDIR=/usr/local/opt/openssl - - INCLUDEPATHS= \ - -I"$(CURDIR)" \ -- -I"$(CURDIR)"/obj \ -+ -I"$(CURDIR)/obj" \ - -I"$(DEPSDIR)/include" \ -- -I"$(DEPSDIR)/include/db48" -+ -I"$(DB4DIR)/include" \ -+ -I"$(OPENSSLDIR)/include" - - LIBPATHS= \ - -L"$(DEPSDIR)/lib" \ -- -L"$(DEPSDIR)/lib/db48" -+ -L"$(DB4DIR)/lib" \ -+ -L"$(OPENSSLDIR)/lib" - - USE_UPNP:=1 - USE_IPV6:=1 -@@ -31,14 +35,14 @@ ifdef STATIC - TESTLIBS += \ - $(DEPSDIR)/lib/libboost_unit_test_framework-mt.a - LIBS += \ -- $(DEPSDIR)/lib/db48/libdb_cxx-4.8.a \ -+ $(DB4DIR)/lib/libdb_cxx-4.8.a \ - $(DEPSDIR)/lib/libboost_system-mt.a \ - $(DEPSDIR)/lib/libboost_filesystem-mt.a \ - $(DEPSDIR)/lib/libboost_program_options-mt.a \ - $(DEPSDIR)/lib/libboost_thread-mt.a \ - $(DEPSDIR)/lib/libboost_chrono-mt.a \ -- $(DEPSDIR)/lib/libssl.a \ -- $(DEPSDIR)/lib/libcrypto.a \ -+ $(OPENSSLDIR)/lib/libssl.a \ -+ $(OPENSSLDIR)/lib/libcrypto.a \ - -lz - else - TESTLIBS += \ 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 diff --git a/src/qt/forms/sendcoinsdialog.ui b/src/qt/forms/sendcoinsdialog.ui index 6e17565ab0..2a00fc5455 100644 --- a/src/qt/forms/sendcoinsdialog.ui +++ b/src/qt/forms/sendcoinsdialog.ui @@ -28,7 +28,7 @@ <height>165</height> </rect> </property> - <layout class="QVBoxLayout" name="verticalLayout_2"> + <layout class="QVBoxLayout" name="verticalLayout_2" stretch="0,1"> <property name="margin"> <number>0</number> </property> |