Remove a workaround for an older version of GCC.

GLIBC's byte swap functions are a good fallback option.

diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 0eb0401898ef6c0114bc2fabfab85fdd58210aa7..88980ea13126390b501dff130110ac1e2dad2566 100644 (file)
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -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() {

diff --git a/config.h.cmake b/config.h.cmake
index 1bec58cc78c43bab4641b1d2d027f96d8aabc4f3..ee0e67ac6537bab86f6e49ab96452e58717cfac7 100644 (file)
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -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

diff --git a/taglib/toolkit/tutils.h b/taglib/toolkit/tutils.h
index 68e5fc5658556826f1a24f513507c36bb92f1580..82f1dd9af5ff3467fc9df1a07114464c0ea35470 100644 (file)
--- a/taglib/toolkit/tutils.h
+++ b/taglib/toolkit/tutils.h
@@ -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);