21e403a7b9
Since commit 0fcabdeb52, compat/bswap.h
redefined htonl and ntohl to bswap32 not only if bswap32 has been
defined earlier in compat/bswap.h (which is done only on selected
platforms), but also if bswap32 has been defined anywhere else. This
broke Git at least for NetBSD systems running on big-endian machines
(where ntohl and htonl should, of course, be NOOPs), since NetBSD
defines a bswap32 macro in the system headers.
So, we now undefine any previously defined bswap32 in compat/bswap.h
before defining our own.
Signed-off-by: Holger Weiß <holger@zedat.fu-berlin.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
49 lines
1.0 KiB
C
49 lines
1.0 KiB
C
/*
|
|
* Let's make sure we always have a sane definition for ntohl()/htonl().
|
|
* Some libraries define those as a function call, just to perform byte
|
|
* shifting, bringing significant overhead to what should be a simple
|
|
* operation.
|
|
*/
|
|
|
|
/*
|
|
* Default version that the compiler ought to optimize properly with
|
|
* constant values.
|
|
*/
|
|
static inline uint32_t default_swab32(uint32_t val)
|
|
{
|
|
return (((val & 0xff000000) >> 24) |
|
|
((val & 0x00ff0000) >> 8) |
|
|
((val & 0x0000ff00) << 8) |
|
|
((val & 0x000000ff) << 24));
|
|
}
|
|
|
|
#undef bswap32
|
|
|
|
#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
|
|
|
|
#define bswap32(x) ({ \
|
|
uint32_t __res; \
|
|
if (__builtin_constant_p(x)) { \
|
|
__res = default_swab32(x); \
|
|
} else { \
|
|
__asm__("bswap %0" : "=r" (__res) : "0" ((uint32_t)(x))); \
|
|
} \
|
|
__res; })
|
|
|
|
#elif defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_X64))
|
|
|
|
#include <stdlib.h>
|
|
|
|
#define bswap32(x) _byteswap_ulong(x)
|
|
|
|
#endif
|
|
|
|
#ifdef bswap32
|
|
|
|
#undef ntohl
|
|
#undef htonl
|
|
#define ntohl(x) bswap32(x)
|
|
#define htonl(x) bswap32(x)
|
|
|
|
#endif
|