diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-05-15 13:54:32 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-05-15 13:59:07 +0200 |
| commit | e47c94e64c44e817ac80cf682a68ba0c4580952f (patch) | |
| tree | ee2c59e0e8d3344673bcba76e2adeacec00b41a8 /src/script/script.h | |
| parent | f0043c2d6d2ceddd631a76b424dd8c163f3dad66 (diff) | |
| parent | f13dac972c9cf308abf72a1d1a54135b1392eaea (diff) | |
Merge pull request #6135
f13dac9 Comment edits and cleanup (BitcoinPRReadingGroup)
ff734e9 Alphabetic order in makefile (Jorge Timón)
5207f33 fix header include groups (Philip Kaufmann)
59b149f remove unneeded incude of wallet/db.h from rpcmining.cpp (Philip Kaufmann)
3703385 remove unused classes from db.h (Philip Kaufmann)
0a7bcb7 fix IDE/compiler warning "extra ';'" in validationinterface.h (Philip Kaufmann)
3b00e7c [Trivial] Update COPYING (sandakersmann)
dd9e688 Trivial: Corrected owner of DNS seeder (ayeowch)
a60bfd8 [init] better message when no wallet support is compiled in (Philip Kaufmann)
78f44b6 Capitalized P2P (sandakersmann)
8e9248d [Trivial] Cryptocurrency is one word (sandakersmann)
803f51e Typo in GetRawMemPool RPC method help: "]" --> "}" (Chris Arnesen)
605a735 addrman: update comments (Pavel Vasin)
Diffstat (limited to 'src/script/script.h')
| -rw-r--r-- | src/script/script.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/script/script.h b/src/script/script.h index ed456f5c5a..d5045005be 100644 --- a/src/script/script.h +++ b/src/script/script.h @@ -6,6 +6,8 @@ #ifndef BITCOIN_SCRIPT_SCRIPT_H #define BITCOIN_SCRIPT_SCRIPT_H +#include "crypto/common.h" + #include <assert.h> #include <climits> #include <limits> @@ -14,7 +16,6 @@ #include <string.h> #include <string> #include <vector> -#include "crypto/common.h" static const unsigned int MAX_SCRIPT_ELEMENT_SIZE = 520; // bytes |