From: Andy Polyakov <appro@openssl.org>
Date: Sat, 30 Jul 2005 19:49:24 +0000 (+0000)
Subject: Fix #if _MSC_VER clause in aes_locl.h [from HEAD].
X-Git-Tag: OpenSSL_0_9_8a~67
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1957924d5124e5b5f3b98f8cf571b700db21336a;p=oweals%2Fopenssl.git

Fix #if _MSC_VER clause in aes_locl.h [from HEAD].
---

diff --git a/crypto/aes/aes_locl.h b/crypto/aes/aes_locl.h
index 183805a15a..054b442d41 100644
--- a/crypto/aes/aes_locl.h
+++ b/crypto/aes/aes_locl.h
@@ -62,7 +62,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#if defined(_MSC_VER) && !defined(_M_IA64) && !defined(OPENSSL_SYS_WINCE)
+#if defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_AMD64) || defined(_M_X64))
 # define SWAP(x) (_lrotl(x, 8) & 0x00ff00ff | _lrotr(x, 8) & 0xff00ff00)
 # define GETU32(p) SWAP(*((u32 *)(p)))
 # define PUTU32(ct, st) { *((u32 *)(ct)) = SWAP((st)); }