diff options
| author | lloyd <[email protected]> | 2011-04-22 13:08:05 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2011-04-22 13:08:05 +0000 |
| commit | 8b40f974e65b7cc7d21a8e72b5f18f6e14208e57 (patch) | |
| tree | 1192bdf14dbab29218db64abbef9ec0217ce30c8 /src/utils/bswap.h | |
| parent | 7b96a4844bf97b9c04a18565334e21dc89b8ba0b (diff) | |
Rename all references of ia32 to x86-32 and amd64 to x86-64.
Back the reported version from 1.10.0 to 1.9.17 for the time
being. Still on the fence if this will be 1.10.0 or another release
candidate instead.
Diffstat (limited to 'src/utils/bswap.h')
| -rw-r--r-- | src/utils/bswap.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/utils/bswap.h b/src/utils/bswap.h index 66a230d46..9d2c9bc28 100644 --- a/src/utils/bswap.h +++ b/src/utils/bswap.h @@ -59,7 +59,7 @@ inline u32bit reverse_bytes(u32bit val) return val; -#elif defined(_MSC_VER) && defined(BOTAN_TARGET_ARCH_IS_IA32) +#elif defined(_MSC_VER) && defined(BOTAN_TARGET_ARCH_IS_X86_32) // Visual C++ inline asm for 32-bit x86, by Yves Jerschow __asm mov eax, val; @@ -84,7 +84,7 @@ inline u64bit reverse_bytes(u64bit val) // GCC intrinsic added in 4.3, works for a number of CPUs return __builtin_bswap64(val); -#elif BOTAN_USE_GCC_INLINE_ASM && defined(BOTAN_TARGET_ARCH_IS_AMD64) +#elif BOTAN_USE_GCC_INLINE_ASM && defined(BOTAN_TARGET_ARCH_IS_X86_64) // GCC-style inline assembly for x86-64 asm("bswapq %0" : "=r" (val) : "0" (val)); return val; |