@@ -64,12 +64,12 @@
 #  define OF_BIGGEST_ALIGNMENT 16
 # endif
 #endif
 
 #ifdef __GNUC__
-# if defined(__amd64__) || defined(__x86_64__)
-#  define OF_AMD64_ASM
+# if defined(__x86_64__) || defined(__amd64__)
+#  define OF_X86_64_ASM
 # elif defined(__i386__)
 #  define OF_X86_ASM
 # elif defined(__ppc__) || defined(__PPC__)
 #  define OF_PPC_ASM
 # elif defined(__arm__) || defined(__ARM__)
@@ -201,11 +201,11 @@
 }
 
 static OF_INLINE uint16_t OF_CONST_FUNC
 OF_BSWAP16_NONCONST(uint16_t i)
 {
-#if defined(OF_X86_ASM) || defined(OF_AMD64_ASM)
+#if defined(OF_X86_64_ASM) || defined(OF_X86_ASM)
 	__asm__ (
 	    "xchgb	%h0, %b0"
 	    : "=Q"(i)
 	    : "0"(i)
 	);
@@ -229,11 +229,11 @@
 }
 
 static OF_INLINE uint32_t OF_CONST_FUNC
 OF_BSWAP32_NONCONST(uint32_t i)
 {
-#if defined(OF_X86_ASM) || defined(OF_AMD64_ASM)
+#if defined(OF_X86_64_ASM) || defined(OF_X86_ASM)
 	__asm__ (
 	    "bswap	%0"
 	    : "=q"(i)
 	    : "0"(i)
 	);
@@ -259,11 +259,11 @@
 }
 
 static OF_INLINE uint64_t OF_CONST_FUNC
 OF_BSWAP64_NONCONST(uint64_t i)
 {
-#if defined(OF_AMD64_ASM)
+#if defined(OF_X86_64_ASM)
 	__asm__ (
 	    "bswap	%0"
 	    : "=r"(i)
 	    : "0"(i)
 	);