diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-06-13 13:29:14 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-06-13 13:29:14 -0700 |
| commit | e1f335f3d4877ffa39987e6cd80ae79d1c4100d8 (patch) | |
| tree | 15bda386e105447b5c196a4eb7fe72ffb7230626 | |
| parent | Merge branch 'jc/sed-build-fixes' (diff) | |
| parent | Revert "bswap.h: add support for built-in bswap functions" (diff) | |
| download | git-e1f335f3d4877ffa39987e6cd80ae79d1c4100d8.tar.gz git-e1f335f3d4877ffa39987e6cd80ae79d1c4100d8.zip | |
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"
Diffstat (limited to '')
| -rw-r--r-- | compat/bswap.h | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/compat/bswap.h b/compat/bswap.h index 9e0f98e00b..b34054f2bd 100644 --- a/compat/bswap.h +++ b/compat/bswap.h @@ -35,19 +35,7 @@ static inline uint64_t default_bswap64(uint64_t val) #undef bswap32 #undef bswap64 -/** - * __has_builtin is available since Clang 10 and GCC 10. - * Below is a fallback for older compilers. - */ -#ifndef __has_builtin - #define __has_builtin(x) 0 -#endif - -#if __has_builtin(__builtin_bswap32) && __has_builtin(__builtin_bswap64) -#define bswap32(x) __builtin_bswap32((x)) -#define bswap64(x) __builtin_bswap64((x)) - -#elif defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) +#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) #define bswap32 git_bswap32 static inline uint32_t git_bswap32(uint32_t x) |