From 0e65e7bd075df2172c17e16c4deaf44040f2559d Mon Sep 17 00:00:00 2001
From: Jeff Garzik <jgarzik@bitpay.com>
Date: Wed, 31 Jul 2013 08:45:49 -0400
Subject: [PATCH] Minor miner fixes (hey hey it's fun to say)

* Fix UpdateCoins() definition in main.h
* Remove pwalletMain reference from BitcoinMiner(), as it is passed
  a wallet argument.

Conflicts:
	src/main.h

Rebased-from: 18946846d5c321d2afc11445580874c9a8bb0733
---
 src/main.cpp | 2 +-
 src/main.h   | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main.cpp b/src/main.cpp
index 03b6946ed..c9fc79044 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4606,7 +4606,7 @@ void static LitecoinMiner(CWallet *pwallet)
                 {
                     // Found a solution
                     SetThreadPriority(THREAD_PRIORITY_NORMAL);
-                    CheckWork(pblock, *pwalletMain, reservekey);
+                    CheckWork(pblock, *pwallet, reservekey);
                     SetThreadPriority(THREAD_PRIORITY_LOWEST);
                     break;
                 }
diff --git a/src/main.h b/src/main.h
index 9d731d869..4b7f987e1 100644
--- a/src/main.h
+++ b/src/main.h
@@ -621,6 +621,9 @@ public:
         return dPriority > COIN * 576 / 250;
     }
 
+// Apply the effects of this transaction on the UTXO set represented by view
+void UpdateCoins(const CTransaction& tx, CValidationState &state, CCoinsViewCache &inputs, CTxUndo &txundo, int nHeight, const uint256 &txhash);
+
     int64 GetMinFee(unsigned int nBlockSize=1, bool fAllowFree=true, enum GetMinFee_mode mode=GMF_BLOCK) const;
 
     friend bool operator==(const CTransaction& a, const CTransaction& b)