aboutsummaryrefslogtreecommitdiff
path: root/src/script
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2015-11-09 19:16:38 +0100
committerMarcoFalke <falke.marco@gmail.com>2015-11-28 19:01:11 +0100
commitfaf93f37fe47fe326fcc4955302a66f24eb13b65 (patch)
treea1f2ed7942c30233341f58f85cff6eaf2e14cb5e /src/script
parent3307bdb3331732e781c77a88ef7053fe23c78701 (diff)
downloadbitcoin-faf93f37fe47fe326fcc4955302a66f24eb13b65.tar.xz
[trivial] Reuse translation and cleanup DEFAULT_* values
* DEFAULT_DISABLE_SAFEMODE = false * Use DEFAULT_* constants for extern bools
Diffstat (limited to 'src/script')
-rw-r--r--src/script/standard.cpp2
-rw-r--r--src/script/standard.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/script/standard.cpp b/src/script/standard.cpp
index 60cf7ae49d..4863b96391 100644
--- a/src/script/standard.cpp
+++ b/src/script/standard.cpp
@@ -16,7 +16,7 @@ using namespace std;
typedef vector<unsigned char> valtype;
-bool fAcceptDatacarrier = true;
+bool fAcceptDatacarrier = DEFAULT_ACCEPT_DATACARRIER;
unsigned nMaxDatacarrierBytes = MAX_OP_RETURN_RELAY;
CScriptID::CScriptID(const CScript& in) : uint160(Hash160(in.begin(), in.end())) {}
diff --git a/src/script/standard.h b/src/script/standard.h
index 140306861a..2b9fbe78dd 100644
--- a/src/script/standard.h
+++ b/src/script/standard.h
@@ -13,6 +13,8 @@
#include <stdint.h>
+static const bool DEFAULT_ACCEPT_DATACARRIER = true;
+
class CKeyID;
class CScript;