mirror/taglib
1
0
Fork 0
mirror of https://github.com/taglib/taglib.git synced 2025-05-25 20:20:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove a workaround for an older version of GCC.

Browse Source 
GLIBC's byte swap functions are a good fallback option.
This commit is contained in:
Tsuda Kageyu 2015-08-07 08:59:16 +09:00
parent edbafdbd88
commit 80441ff754
3 changed files with 7 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ConfigureChecks.cmake
View File

@ -107,30 +107,16 @@ endif()
# Determine which kind of byte swap functions your compiler supports.
# GCC's __builtin_bswap* should be checked individually
# because some of them can be missing depends on the GCC version.
check_cxx_source_compiles("
int main() {
__builtin_bswap16(0);
return 0;
}
" HAVE_GCC_BYTESWAP_16)
check_cxx_source_compiles("
int main() {
__builtin_bswap32(0);
return 0;
}
" HAVE_GCC_BYTESWAP_32)
check_cxx_source_compiles("
int main() {
__builtin_bswap64(0);
return 0;
}
" HAVE_GCC_BYTESWAP_64)
" HAVE_GCC_BYTESWAP)
if(NOT HAVE_GCC_BYTESWAP_16 OR NOT HAVE_GCC_BYTESWAP_32 OR NOT HAVE_GCC_BYTESWAP_64)
if(NOT HAVE_GCC_BYTESWAP)
check_cxx_source_compiles("
#include <byteswap.h>
int main() {

4
config.h.cmake
View File

@ -1,9 +1,7 @@
/* config.h. Generated by cmake from config.h.cmake */
/* Defined if your compiler supports some byte swap functions */
#cmakedefine HAVE_GCC_BYTESWAP_16 1
#cmakedefine HAVE_GCC_BYTESWAP_32 1
#cmakedefine HAVE_GCC_BYTESWAP_64 1
#cmakedefine HAVE_GCC_BYTESWAP 1
#cmakedefine HAVE_GLIBC_BYTESWAP 1
#cmakedefine HAVE_MSC_BYTESWAP 1
#cmakedefine HAVE_MAC_BYTESWAP 1

8
taglib/toolkit/tutils.h
View File

@ -44,7 +44,7 @@
# include <sys/endian.h>
#endif
#include "tstring.h"
#include <tstring.h>
#include <cstdio>
#include <cstdarg>
#include <cstring>
@ -59,7 +59,7 @@ namespace TagLib
*/
inline ushort byteSwap(ushort x)
{
#if defined(HAVE_GCC_BYTESWAP_16)
#if defined(HAVE_GCC_BYTESWAP)
return __builtin_bswap16(x);
@ -91,7 +91,7 @@ namespace TagLib
*/
inline uint byteSwap(uint x)
{
#if defined(HAVE_GCC_BYTESWAP_32)
#if defined(HAVE_GCC_BYTESWAP)
return __builtin_bswap32(x);
@ -126,7 +126,7 @@ namespace TagLib
*/
inline ulonglong byteSwap(ulonglong x)
{
#if defined(HAVE_GCC_BYTESWAP_64)
#if defined(HAVE_GCC_BYTESWAP)
return __builtin_bswap64(x);