From bc9bdf09af335b6c8e50b522fa1ff57900e32c7d Mon Sep 17 00:00:00 2001
From: Lefteris Karapetsas <lefteris@refu.co>
Date: Mon, 6 Jul 2015 15:58:07 +0200
Subject: [PATCH] Move defaults so that cl_miner is not included in MinerAux.h

---
 ethminer/MinerAux.h            | 1 -
 libethash-cl/ethash_cl_miner.h | 7 -------
 libethcore/Ethash.h            | 7 +++++++
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/ethminer/MinerAux.h b/ethminer/MinerAux.h
index 9c199cecb..eba68a4c3 100644
--- a/ethminer/MinerAux.h
+++ b/ethminer/MinerAux.h
@@ -39,7 +39,6 @@
 #include <libdevcore/SHA3.h>
 #include <libethcore/ProofOfWork.h>
 #include <libethcore/EthashAux.h>
-#include <libethash-cl/ethash_cl_miner.h>
 #include <libethcore/Farm.h>
 #if ETH_JSONRPC || !ETH_TRUE
 #include <libweb3jsonrpc/WebThreeStubServer.h>
diff --git a/libethash-cl/ethash_cl_miner.h b/libethash-cl/ethash_cl_miner.h
index c60ee1881..8f7594be5 100644
--- a/libethash-cl/ethash_cl_miner.h
+++ b/libethash-cl/ethash_cl_miner.h
@@ -17,13 +17,6 @@
 #include <functional>
 #include <libethash/ethash.h>
 
-/// Default value of the local work size. Also known as workgroup size.
-#define CL_DEFAULT_LOCAL_WORK_SIZE 64
-/// Default value of the global work size as a multiplier of the local work size
-#define CL_DEFAULT_GLOBAL_WORK_SIZE_MULTIPLIER 512 // * CL_DEFAULT_LOCAL_WORK_SIZE
-/// Default value of the milliseconds per global work size (per batch)
-#define CL_DEFAULT_MS_PER_BATCH 100
-
 class ethash_cl_miner
 {
 private:
diff --git a/libethcore/Ethash.h b/libethcore/Ethash.h
index e9ddf16ca..8cc392306 100644
--- a/libethcore/Ethash.h
+++ b/libethcore/Ethash.h
@@ -31,6 +31,13 @@
 #include "BlockInfo.h"
 #include "Miner.h"
 
+/// Default value of the local work size. Also known as workgroup size.
+#define CL_DEFAULT_LOCAL_WORK_SIZE 64
+/// Default value of the global work size as a multiplier of the local work size
+#define CL_DEFAULT_GLOBAL_WORK_SIZE_MULTIPLIER 512 // * CL_DEFAULT_LOCAL_WORK_SIZE
+/// Default value of the milliseconds per global work size (per batch)
+#define CL_DEFAULT_MS_PER_BATCH 100
+
 class ethash_cl_miner;
 
 namespace dev