summaryrefslogtreecommitdiffstats
path: root/crypto/engine
diff options
context:
space:
mode:
authorAndy Polyakov <appro@openssl.org>2006-10-23 07:41:05 +0000
committerAndy Polyakov <appro@openssl.org>2006-10-23 07:41:05 +0000
commita6efc2d1b8848e3a9f57acfea881e187afa38820 (patch)
treed3c181f2316fd5786226339d06e91f0263539a11 /crypto/engine
parent3189772e07dafe359f84ada71001515127bc396d (diff)
Fix mingw warnings.
Diffstat (limited to 'crypto/engine')
-rw-r--r--crypto/engine/eng_padlock.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/crypto/engine/eng_padlock.c b/crypto/engine/eng_padlock.c
index e1d66eac58..3fbb51b585 100644
--- a/crypto/engine/eng_padlock.c
+++ b/crypto/engine/eng_padlock.c
@@ -123,9 +123,11 @@ void ENGINE_load_padlock (void)
#ifdef COMPILE_HW_PADLOCK
/* We do these includes here to avoid header problems on platforms that
do not have the VIA padlock anyway... */
-#ifdef _MSC_VER
+#ifdef _WIN32
# include <malloc.h>
-# define alloca _alloca
+# ifndef alloca
+# define alloca _alloca
+# endif
#else
# include <stdlib.h>
#endif