Commit 2f8b6a03 authored by Erik de Castro Lopo's avatar Erik de Castro Lopo
Browse files

Rename ENDSWAP_INT to ENDSWAP_32.

parent b81e7943
...@@ -33,21 +33,21 @@ ...@@ -33,21 +33,21 @@
#if HAVE_BSWAP32 /* GCC and Clang */ #if HAVE_BSWAP32 /* GCC and Clang */
#define ENDSWAP_INT(x) (__builtin_bswap32 (x)) #define ENDSWAP_32(x) (__builtin_bswap32 (x))
#elif defined _MSC_VER /* Windows. Apparently in <stdlib.h>. */ #elif defined _MSC_VER /* Windows. Apparently in <stdlib.h>. */
#define ENDSWAP_INT(x) ((int) _byteswap_ulong (x)) #define ENDSWAP_32(x) (_byteswap_ulong (x))
#elif HAVE_BYTESWAP_H /* Linux */ #elif HAVE_BYTESWAP_H /* Linux */
#include <byteswap.h> #include <byteswap.h>
#define ENDSWAP_INT(x) ((int) bswap_32 (x)) #define ENDSWAP_32(x) (bswap_32 (x))
#else #else
#define ENDSWAP_INT(x) ((((x) >> 24) & 0xFF) + (((x) >> 8) & 0xFF00) + (((x) & 0xFF00) << 8) + (((x) & 0xFF) << 24)) #define ENDSWAP_32(x) ((((x) >> 24) & 0xFF) + (((x) >> 8) & 0xFF00) + (((x) & 0xFF00) << 8) + (((x) & 0xFF) << 24))
#endif #endif
...@@ -53,7 +53,7 @@ typedef FLAC__uint32 brword; ...@@ -53,7 +53,7 @@ typedef FLAC__uint32 brword;
#if WORDS_BIGENDIAN #if WORDS_BIGENDIAN
#define SWAP_BE_WORD_TO_HOST(x) (x) #define SWAP_BE_WORD_TO_HOST(x) (x)
#else #else
#define SWAP_BE_WORD_TO_HOST(x) ENDSWAP_INT(x) #define SWAP_BE_WORD_TO_HOST(x) ENDSWAP_32(x)
#endif #endif
/* counts the # of zero MSBs in a word */ /* counts the # of zero MSBs in a word */
#define COUNT_ZERO_MSBS(word) ( \ #define COUNT_ZERO_MSBS(word) ( \
......
...@@ -52,7 +52,7 @@ typedef FLAC__uint32 bwword; ...@@ -52,7 +52,7 @@ typedef FLAC__uint32 bwword;
#if WORDS_BIGENDIAN #if WORDS_BIGENDIAN
#define SWAP_BE_WORD_TO_HOST(x) (x) #define SWAP_BE_WORD_TO_HOST(x) (x)
#else #else
#define SWAP_BE_WORD_TO_HOST(x) ENDSWAP_INT(x) #define SWAP_BE_WORD_TO_HOST(x) ENDSWAP_32(x)
#endif #endif
/* /*
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment