mirror/taglib
1
0
Fork 0
mirror of https://github.com/taglib/taglib.git synced 2025-07-19 21:44:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Enable Boost Endian library again.

Browse Source 
It should be detected properly now.
This commit is contained in:
Tsuda Kageyu
2016-02-15 01:36:17 +09:00
parent f8f7cb0904
commit f3016c0892
4 changed files with 67 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
taglib/CMakeLists.txt
View File

@ -32,7 +32,7 @@ elseif(HAVE_ZLIB_SOURCE)
include_directories(${ZLIB_SOURCE})
endif()
if(HAVE_BOOST_ATOMIC)
if(HAVE_BOOST_BYTESWAP OR HAVE_BOOST_ATOMIC)
include_directories(${Boost_INCLUDE_DIR})
endif()

22
taglib/toolkit/tutils.h
View File

@ -34,7 +34,9 @@
# include <config.h>
#endif
#if defined(HAVE_MSC_BYTESWAP)
#if defined(HAVE_BOOST_BYTESWAP)
# include <boost/endian/conversion.hpp>
#elif defined(HAVE_MSC_BYTESWAP)
# include <stdlib.h>
#elif defined(HAVE_GLIBC_BYTESWAP)
# include <byteswap.h>
@ -59,7 +61,11 @@ namespace TagLib
*/
inline unsigned short byteSwap(unsigned short x)
{
#if defined(HAVE_GCC_BYTESWAP)
#if defined(HAVE_BOOST_BYTESWAP)
return boost::endian::endian_reverse(x);
#elif defined(HAVE_GCC_BYTESWAP)
return __builtin_bswap16(x);
@ -91,7 +97,11 @@ namespace TagLib
*/
inline unsigned int byteSwap(unsigned int x)
{
#if defined(HAVE_GCC_BYTESWAP)
#if defined(HAVE_BOOST_BYTESWAP)
return boost::endian::endian_reverse(x);
#elif defined(HAVE_GCC_BYTESWAP)
return __builtin_bswap32(x);
@ -126,7 +136,11 @@ namespace TagLib
*/
inline unsigned long long byteSwap(unsigned long long x)
{
#if defined(HAVE_GCC_BYTESWAP)
#if defined(HAVE_BOOST_BYTESWAP)
return boost::endian::endian_reverse(x);
#elif defined(HAVE_GCC_BYTESWAP)
return __builtin_bswap64(x);