push: mention "git pull" in error message for non-fast forwards

[git.git] / compat / bswap.h

diff --git a/compat/bswap.h b/compat/bswap.h
index 279e0b48b15e091fc0ca975c3efbd461ab02c149..54756dbb05ba99ab1679f17a50f04c3f1cede8e6 100644 (file)
--- 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; })