diff options
| -rw-r--r-- | bitcoin-qt.pro | 1 | ||||
| -rw-r--r-- | src/makefile.osx | 2 | ||||
| -rw-r--r-- | src/uint256.h | 5 |
3 files changed, 6 insertions, 2 deletions
diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro index d938c07c45..07eadb5db9 100644 --- a/bitcoin-qt.pro +++ b/bitcoin-qt.pro @@ -411,6 +411,7 @@ LIBS += -lssl -lcrypto -ldb_cxx$$BDB_LIB_SUFFIX win32:LIBS += -lws2_32 -lshlwapi -lmswsock -lole32 -loleaut32 -luuid -lgdi32 LIBS += -lboost_system$$BOOST_LIB_SUFFIX -lboost_filesystem$$BOOST_LIB_SUFFIX -lboost_program_options$$BOOST_LIB_SUFFIX -lboost_thread$$BOOST_THREAD_LIB_SUFFIX win32:LIBS += -lboost_chrono$$BOOST_LIB_SUFFIX +macx:LIBS += -lboost_chrono$$BOOST_LIB_SUFFIX contains(RELEASE, 1) { !win32:!macx { diff --git a/src/makefile.osx b/src/makefile.osx index af12731fa4..50279fdb05 100644 --- a/src/makefile.osx +++ b/src/makefile.osx @@ -36,6 +36,7 @@ LIBS += \ $(DEPSDIR)/lib/libboost_filesystem-mt.a \ $(DEPSDIR)/lib/libboost_program_options-mt.a \ $(DEPSDIR)/lib/libboost_thread-mt.a \ + $(DEPSDIR)/lib/libboost_chrono-mt.a \ $(DEPSDIR)/lib/libssl.a \ $(DEPSDIR)/lib/libcrypto.a \ -lz @@ -48,6 +49,7 @@ LIBS += \ -lboost_filesystem-mt \ -lboost_program_options-mt \ -lboost_thread-mt \ + -lboost_chrono-mt \ -lssl \ -lcrypto \ -lz diff --git a/src/uint256.h b/src/uint256.h index 8a9af8ba04..2a252c94f3 100644 --- a/src/uint256.h +++ b/src/uint256.h @@ -8,6 +8,7 @@ #include <limits.h> #include <stdio.h> #include <string.h> +#include <inttypes.h> #include <string> #include <vector> @@ -20,14 +21,14 @@ inline int Testuint256AdHoc(std::vector<std::string> vArg); /** Base class without constructors for uint256 and uint160. - * This makes the compiler let u use it in a union. + * This makes the compiler let you use it in a union. */ template<unsigned int BITS> class base_uint { protected: enum { WIDTH=BITS/32 }; - unsigned int pn[WIDTH]; + uint32_t pn[WIDTH]; public: bool operator!() const |