Skip to content

Commit e1f335f

Browse files
committed
Merge branch 'ss/revert-builtin-bswap-stuff'
Revert a botched bswap.h change that broke ntohll() functions on big-endian systems with __builtin_bswap32/64(). * ss/revert-builtin-bswap-stuff: Revert "bswap.h: add support for built-in bswap functions"
2 parents f2a6a1e + 1c62df0 commit e1f335f

File tree

1 file changed

+1
-13
lines changed

1 file changed

+1
-13
lines changed

compat/bswap.h

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

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__))
38+
#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
5139

5240
#define bswap32 git_bswap32
5341
static inline uint32_t git_bswap32(uint32_t x)

0 commit comments

Comments
 (0)