From: Andy Polyakov <appro@openssl.org>
Date: Mon, 4 Apr 2005 17:05:06 +0000 (+0000)
Subject: Some non-GNU compilers (such as Sun C) define __i386.
X-Git-Tag: OpenSSL_0_9_7g~7^2~17
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f8fa22d826bf12863fb2e0cee9118a97468a4c2b;p=oweals%2Fopenssl.git

Some non-GNU compilers (such as Sun C) define __i386.
---

diff --git a/crypto/engine/eng_padlock.c b/crypto/engine/eng_padlock.c
index 4f64a06fb0..87e62d0d5d 100644
--- a/crypto/engine/eng_padlock.c
+++ b/crypto/engine/eng_padlock.c
@@ -97,7 +97,8 @@
    compiler choice is limited to GCC and Microsoft C. */
 #undef COMPILE_HW_PADLOCK
 #if !defined(I386_ONLY) && !defined(OPENSSL_NO_INLINE_ASM)
-# if defined(__i386__) || defined(__i386) || defined(_M_IX86)
+# if (defined(__GNUC__) && (defined(__i386__) || defined(__i386))) || \
+     (defined(_MSC_VER) && defined(_M_IX86))
 #  define COMPILE_HW_PADLOCK
 static ENGINE *ENGINE_padlock (void);
 # endif