X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=compat%2Fbswap.h;h=5061214f73d2d51cfd1d49b97b4e69be913928bd;hb=b919f8404a9e212b3b9d602d4060e440072a0303;hp=54756dbb05ba99ab1679f17a50f04c3f1cede8e6;hpb=eb4e67288bb9d66fb46092fa30d72c4bdded0c2a;p=git.git

diff --git a/compat/bswap.h b/compat/bswap.h
index 54756dbb0..5061214f7 100644
--- a/compat/bswap.h
+++ b/compat/bswap.h
@@ -21,14 +21,16 @@ static inline uint32_t default_swab32(uint32_t val)
 
 #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; })
+#define bswap32 git_bswap32
+static inline uint32_t git_bswap32(uint32_t x)
+{
+	uint32_t result;
+	if (__builtin_constant_p(x))
+		result = default_swab32(x);
+	else
+		__asm__("bswap %0" : "=r" (result) : "0" (x));
+	return result;
+}
 
 #elif defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_X64))