merged RC_1_1 into RC_1_2
This commit is contained in:
commit
3ce277ba7f
|
@ -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
|
||||
|
|
4
Jamfile
4
Jamfile
|
@ -70,6 +70,10 @@ rule linking ( properties * )
|
|||
{
|
||||
result += <library>ssl ;
|
||||
result += <library>crypto ;
|
||||
if <target-os>linux in $(properties)
|
||||
{
|
||||
result += <library>dl ;
|
||||
}
|
||||
}
|
||||
else if <crypto>libcrypto in $(properties)
|
||||
{
|
||||
|
|
|
@ -16,7 +16,7 @@ changelog at the end of the file.
|
|||
#include "libtorrent/sha1.hpp"
|
||||
|
||||
#include "libtorrent/aux_/disable_warnings_push.hpp"
|
||||
#include <boost/detail/endian.hpp> // for BIG_ENDIAN and LITTLE_ENDIAN macros
|
||||
#include <boost/predef/other/endian.h>
|
||||
#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<big_endian_blk0>(context, data, len);
|
||||
#elif defined BOOST_LITTLE_ENDIAN
|
||||
#elif BOOST_ENDIAN_LITTLE_BYTE
|
||||
internal_update<little_endian_blk0>(context, data, len);
|
||||
#else
|
||||
// select different functions depending on endianess
|
||||
|
|
Loading…
Reference in New Issue