summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Polyakov <appro@openssl.org>2005-04-04 17:05:06 +0000
committerAndy Polyakov <appro@openssl.org>2005-04-04 17:05:06 +0000
commitf8fa22d826bf12863fb2e0cee9118a97468a4c2b (patch)
treeeb6bd5178678a4a4fd909c9977bed67123a5f6c7
parentc39322228074ec9ca9b22b9d5c4594073435a928 (diff)
downloadopenssl-new-f8fa22d826bf12863fb2e0cee9118a97468a4c2b.tar.gz
Some non-GNU compilers (such as Sun C) define __i386.
-rw-r--r--crypto/engine/eng_padlock.c3
1 files changed, 2 insertions, 1 deletions
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