aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2014-08-20 16:33:55 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2014-08-26 13:25:22 +0200
commitf841aa2892ffd97d564deee103555149d9fbcd9a (patch)
tree170047b2b225aa762b298d6f8d7fed7c2b230fea /src
parent6e5fd003e04b81115b6b164b21f048472d575535 (diff)
Move `COIN` and `CENT` to core.h
Eventually these should end up in `money.h` after monetary amounts are typedef'ed, but at least they don't belong in `util.h`.
Diffstat (limited to 'src')
-rw-r--r--src/core.h3
-rw-r--r--src/util.h3
2 files changed, 3 insertions, 3 deletions
diff --git a/src/core.h b/src/core.h
index 9552f70254..e3ceac97aa 100644
--- a/src/core.h
+++ b/src/core.h
@@ -14,6 +14,9 @@
class CTransaction;
+static const int64_t COIN = 100000000;
+static const int64_t CENT = 1000000;
+
/** No amount larger than this (in satoshi) is valid */
static const int64_t MAX_MONEY = 21000000 * COIN;
inline bool MoneyRange(int64_t nValue) { return (nValue >= 0 && nValue <= MAX_MONEY); }
diff --git a/src/util.h b/src/util.h
index cfbf30c6a4..cbd311574a 100644
--- a/src/util.h
+++ b/src/util.h
@@ -34,9 +34,6 @@
class uint256;
-static const int64_t COIN = 100000000;
-static const int64_t CENT = 1000000;
-
#define BEGIN(a) ((char*)&(a))
#define END(a) ((char*)&((&(a))[1]))
#define UBEGIN(a) ((unsigned char*)&(a))