Index: src/OFMacros.h
==================================================================
--- src/OFMacros.h
+++ src/OFMacros.h
@@ -110,11 +110,12 @@
 #elif defined(OF_X86_ASM)
 	asm("bswap	%%eax\n\t"
 	    "bswap	%%edx\n\t"
 	    "xchgl	%%eax, %%edx" : "=A"(i): "0"(i));
 #else
-	i = (uint64_t)OF_BSWAP32(i & 0xFFFFFFFF) << 32 | OF_BSWAP32(i >> 32);
+	i = (uint64_t)OF_BSWAP32_NONCONST(i & 0xFFFFFFFF) << 32 |
+	    OF_BSWAP32_NONCONST(i >> 32);
 #endif
 	return i;
 }
 
 #ifdef __GNUC__