Merge pull request #1126 from drizztbsd/master

Fix build with gcc 4.7
13 years ago · 6a7a42be16
parent 00b9c0f4b2 9553c35d89
commit 6a7a42be16
2 changed files with 2 additions and 0 deletions
--- a/src/allocators.h
+++ b/src/allocators.h
@ -5,6 +5,7 @@
 #ifndef BITCOIN_ALLOCATORS_H
 #define BITCOIN_ALLOCATORS_H
 #include <string.h>
 #include <string>
 #ifdef WIN32
--- a/src/uint256.h
+++ b/src/uint256.h
@ -6,6 +6,7 @@
 #define BITCOIN_UINT256_H
 #include <limits.h>
 #include <stdio.h>
 #include <string.h>
 #include <string>
 #include <vector>