diff --git a/ChangeLog b/ChangeLog index 8e6280452..69edbc909 100644 --- a/ChangeLog +++ b/ChangeLog @@ -94,6 +94,8 @@ * resume data no longer has timestamps of files * require C++11 to build libtorrent + * replace use of boost-endian with boost-predef + 1.1.12 release * uTP performance fixes diff --git a/Jamfile b/Jamfile index 4250c6a16..b231f03cb 100644 --- a/Jamfile +++ b/Jamfile @@ -70,6 +70,10 @@ rule linking ( properties * ) { result += ssl ; result += crypto ; + if linux in $(properties) + { + result += dl ; + } } else if libcrypto in $(properties) { diff --git a/src/sha1.cpp b/src/sha1.cpp index 063f8e405..739153fed 100644 --- a/src/sha1.cpp +++ b/src/sha1.cpp @@ -16,7 +16,7 @@ changelog at the end of the file. #include "libtorrent/sha1.hpp" #include "libtorrent/aux_/disable_warnings_push.hpp" -#include // for BIG_ENDIAN and LITTLE_ENDIAN macros +#include #include "libtorrent/aux_/disable_warnings_pop.hpp" namespace libtorrent { @@ -165,7 +165,7 @@ using u8 = std::uint8_t; #endif } -#if !defined BOOST_BIG_ENDIAN && !defined BOOST_LITTLE_ENDIAN +#if !BOOST_ENDIAN_BIG_BYTE && !BOOST_ENDIAN_LITTLE_BYTE bool is_big_endian() { u32 test = 1; @@ -194,9 +194,9 @@ void SHA1_update(sha1_ctx* context, u8 const* data, size_t len) { // GCC standard defines for endianness // test with: cpp -dM /dev/null -#if defined BOOST_BIG_ENDIAN +#if BOOST_ENDIAN_BIG_BYTE internal_update(context, data, len); -#elif defined BOOST_LITTLE_ENDIAN +#elif BOOST_ENDIAN_LITTLE_BYTE internal_update(context, data, len); #else // select different functions depending on endianess