diff options
| author | Philip Kaufmann <phil.kaufmann@t-online.de> | 2015-03-27 13:19:49 +0100 |
|---|---|---|
| committer | Cory Fields <cory-nospam-@coryfields.com> | 2015-05-14 01:02:01 -0400 |
| commit | 5207f33f45ec477a46e742434579805b0b7391b8 (patch) | |
| tree | b95be4cc8b07f84b3fdd57afc5a57aa0405eb7e8 /src | |
| parent | 59b149ff829a0c7e5f18e908a3734a5a447e7007 (diff) | |
fix header include groups
Diffstat (limited to 'src')
| -rw-r--r-- | src/script/script.h | 3 | ||||
| -rw-r--r-- | src/serialize.h | 4 | ||||
| -rw-r--r-- | src/util.cpp | 10 |
3 files changed, 9 insertions, 8 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 diff --git a/src/serialize.h b/src/serialize.h index 741f78f8b4..53d8af142f 100644 --- a/src/serialize.h +++ b/src/serialize.h @@ -6,6 +6,8 @@ #ifndef BITCOIN_SERIALIZE_H #define BITCOIN_SERIALIZE_H +#include "compat/endian.h" + #include <algorithm> #include <assert.h> #include <ios> @@ -18,8 +20,6 @@ #include <utility> #include <vector> -#include "compat/endian.h" - class CScript; static const unsigned int MAX_SIZE = 0x02000000; diff --git a/src/util.cpp b/src/util.cpp index da5b259aee..bfb95c9044 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -7,11 +7,6 @@ #include "config/bitcoin-config.h" #endif -#if (defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)) -#include <pthread.h> -#include <pthread_np.h> -#endif - #include "util.h" #include "chainparamsbase.h" @@ -23,6 +18,11 @@ #include <stdarg.h> +#if (defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)) +#include <pthread.h> +#include <pthread_np.h> +#endif + #ifndef WIN32 // for posix_fallocate #ifdef __linux__ |