@@ -496,24 +496,25 @@
 #if defined(OF_HAVE_BUILTIN_BSWAP16)
 	return __builtin_bswap16(i);
 #elif (defined(OF_AMD64) || defined(OF_X86)) && defined(__GNUC__)
 	__asm__ (
 	    "xchg{b}	{ %h0, %b0 | %b0, %h0 }"
-	    : "=Q"(i)
-	    : "0"(i)
+	    : "=Q" (i)
+	    : "0" (i)
 	);
 #elif defined(OF_POWERPC) && defined(__GNUC__)
 	__asm__ (
 	    "lhbrx	%0, 0, %1"
-	    : "=r"(i)
-	    : "r"(&i), "m"(i)
+	    : "=r" (i)
+	    : "r" (&i),
+	      "m" (i)
 	);
 #elif defined(OF_ARMV6) && defined(__GNUC__)
 	__asm__ (
 	    "rev16	%0, %0"
-	    : "=r"(i)
-	    : "0"(i)
+	    : "=r" (i)
+	    : "0" (i)
 	);
 #else
 	i = (i & UINT16_C(0xFF00)) >> 8 |
 	    (i & UINT16_C(0x00FF)) << 8;
 #endif
@@ -526,24 +527,25 @@
 #if defined(OF_HAVE_BUILTIN_BSWAP32)
 	return __builtin_bswap32(i);
 #elif (defined(OF_AMD64) || defined(OF_X86)) && defined(__GNUC__)
 	__asm__ (
 	    "bswap	%0"
-	    : "=q"(i)
-	    : "0"(i)
+	    : "=q" (i)
+	    : "0" (i)
 	);
 #elif defined(OF_POWERPC) && defined(__GNUC__)
 	__asm__ (
 	    "lwbrx	%0, 0, %1"
-	    : "=r"(i)
-	    : "r"(&i), "m"(i)
+	    : "=r" (i)
+	    : "r" (&i),
+	      "m" (i)
 	);
 #elif defined(OF_ARMV6) && defined(__GNUC__)
 	__asm__ (
 	    "rev	%0, %0"
-	    : "=r"(i)
-	    : "0"(i)
+	    : "=r" (i)
+	    : "0" (i)
 	);
 #else
 	i = (i & UINT32_C(0xFF000000)) >> 24 |
 	    (i & UINT32_C(0x00FF0000)) >>  8 |
 	    (i & UINT32_C(0x0000FF00)) <<  8 |
@@ -558,20 +560,20 @@
 #if defined(OF_HAVE_BUILTIN_BSWAP64)
 	return __builtin_bswap64(i);
 #elif defined(OF_AMD64) && defined(__GNUC__)
 	__asm__ (
 	    "bswap	%0"
-	    : "=r"(i)
-	    : "0"(i)
+	    : "=r" (i)
+	    : "0" (i)
 	);
 #elif defined(OF_X86) && defined(__GNUC__)
 	__asm__ (
 	    "bswap	{%%}eax\n\t"
 	    "bswap	{%%}edx\n\t"
 	    "xchg{l}	{ %%eax, %%edx | edx, eax }"
-	    : "=A"(i)
-	    : "0"(i)
+	    : "=A" (i)
+	    : "0" (i)
 	);
 #else
 	i = (uint64_t)OFByteSwap32NonConst(
 	    (uint32_t)(i & UINT32_C(0xFFFFFFFF))) << 32 |
 	    OFByteSwap32NonConst((uint32_t)(i >> 32));