- There's no more need for the snprintf macro.

- Move the inclusion of malloc.h until after all other includes, so we
  can do proper tests of system macros.
- Make sure the correct header file is included to get the builtin
  "alloca" under VMS, and define a macro to map the symbol 'alloca' to
  it.

diff --git a/crypto/engine/eng_padlock.c b/crypto/engine/eng_padlock.c
index 5067bc02dd5f13c212f9ee19753043fa49ff1cac..e010ed259efa0b0bc1bb1a46ccecaf15053e0dc6 100644 (file)
--- a/crypto/engine/eng_padlock.c
+++ b/crypto/engine/eng_padlock.c
@@ -65,11 +65,6 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <malloc.h>
-#ifdef _MSC_VER
-# define alloca   _alloca
-# define snprintf _snprintf
-#endif
 
 #include <openssl/crypto.h>
 #include <openssl/dso.h>
@@ -77,6 +72,16 @@
 #include <openssl/evp.h>
 #include <openssl/aes.h>
 
+#ifdef OPENSSL_SYS_VMS
+# include <builtins.h>
+# define alloca __ALLOCA
+#else
+# include <malloc.h>
+# ifdef _MSC_VER
+#  define alloca _alloca
+# endif
+#endif
+
 #ifndef OPENSSL_NO_HW
 #ifndef OPENSSL_NO_HW_PADLOCK