X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=compat%2Fbswap.h;h=f3b8c44181776a99c3eb79e15542104d67001c9d;hb=3ecaa3b6a5f707617ea610d727c696f43f8b2f0b;hp=279e0b48b15e091fc0ca975c3efbd461ab02c149;hpb=2dfb96c9fc925ce2f9cd6bd347bc15c1edc368fe;p=git.git

diff --git a/compat/bswap.h b/compat/bswap.h
index 279e0b48b..54756dbb0 100644
--- a/compat/bswap.h
+++ b/compat/bswap.h
@@ -17,6 +17,8 @@ static inline uint32_t default_swab32(uint32_t val)
 		((val & 0x000000ff) << 24));
 }
 
+#undef bswap32
+
 #if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
 
 #define bswap32(x) ({ \
@@ -24,7 +26,7 @@ static inline uint32_t default_swab32(uint32_t val)
 	if (__builtin_constant_p(x)) { \
 		__res = default_swab32(x); \
 	} else { \
-		__asm__("bswap %0" : "=r" (__res) : "0" (x)); \
+		__asm__("bswap %0" : "=r" (__res) : "0" ((uint32_t)(x))); \
 	} \
 	__res; })