diff options
| author | Luke Dashjr <[email protected]> | 2012-11-14 21:26:56 +0000 |
|---|---|---|
| committer | Luke Dashjr <[email protected]> | 2012-11-14 21:26:56 +0000 |
| commit | f1a9aad7893173b0351ad32e684dad6f31598210 (patch) | |
| tree | 21373860cc7f22da72e28d97263813f53e450920 /src/serialize.h | |
| parent | No need for test fixture now that multisig is enabled on main network. (diff) | |
| parent | Merge branch '0.5.x' into 0.6.0.x (diff) | |
| download | discoin-f1a9aad7893173b0351ad32e684dad6f31598210.tar.xz discoin-f1a9aad7893173b0351ad32e684dad6f31598210.zip | |
Merge branch '0.6.0.x' into 0.6.x
Conflicts:
src/init.cpp
src/main.cpp
src/serialize.h
Diffstat (limited to 'src/serialize.h')
| -rw-r--r-- | src/serialize.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/serialize.h b/src/serialize.h index 349a40bfe..3d0119927 100644 --- a/src/serialize.h +++ b/src/serialize.h @@ -14,6 +14,8 @@ #include <cstring> #include <cstdio> +#include <openssl/crypto.h> // for OPENSSL_cleanse() + #include <boost/type_traits/is_fundamental.hpp> #include <boost/tuple/tuple.hpp> #include <boost/tuple/tuple_comparison.hpp> |