Skip to content

Commit c9fa624

Browse files
dschoGit for Windows Build Agent
authored and
Git for Windows Build Agent
committed
Merge branch 'builtin-swap-functions'
Do prefer GCC's built-in bit-swap functions. Signed-off-by: Johannes Schindelin <[email protected]>
2 parents 68a2fdb + 5e56ffb commit c9fa624

File tree

1 file changed

+13
-1
lines changed

1 file changed

+13
-1
lines changed

compat/bswap.h

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,19 @@ static inline uint64_t default_bswap64(uint64_t val)
3535
#undef bswap32
3636
#undef bswap64
3737

38-
#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
38+
/**
39+
* __has_builtin is available since Clang 10 and GCC 10.
40+
* Below is a fallback for older compilers.
41+
*/
42+
#ifndef __has_builtin
43+
#define __has_builtin(x) 0
44+
#endif
45+
46+
#if __has_builtin(__builtin_bswap32) && __has_builtin(__builtin_bswap64)
47+
#define bswap32(x) __builtin_bswap32((x))
48+
#define bswap64(x) __builtin_bswap64((x))
49+
50+
#elif defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
3951

4052
#define bswap32 git_bswap32
4153
static inline uint32_t git_bswap32(uint32_t x)

0 commit comments

Comments
 (0)