X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=crypto%2Fengine%2Feng_padlock.c;h=3fbb51b585ee6f8720ba784cbb0a1a0340f173f1;hp=e1d66eac58adcba26a55637eca8d343f89acc02d;hb=a6efc2d1b8848e3a9f57acfea881e187afa38820;hpb=3189772e07dafe359f84ada71001515127bc396d

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