diff options
| author | Richard Levitte <levitte@openssl.org> | 2004-09-13 09:15:06 +0000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2004-09-13 09:15:06 +0000 |
| commit | 6f9bafafa3ffe4c785cfb521dc130b6614b852f0 (patch) | |
| tree | e1a8fc3c2d32b325d6536fc160d7826fb95894c6 /crypto/engine | |
| parent | 422a4a33a509a47acc266cc6472344aa4af02d1a (diff) | |
| download | openssl-6f9bafafa3ffe4c785cfb521dc130b6614b852f0.zip openssl-6f9bafafa3ffe4c785cfb521dc130b6614b852f0.tar.gz openssl-6f9bafafa3ffe4c785cfb521dc130b6614b852f0.tar.bz2 | |
- 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.
Diffstat (limited to 'crypto/engine')
| -rw-r--r-- | crypto/engine/eng_padlock.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/crypto/engine/eng_padlock.c b/crypto/engine/eng_padlock.c index 5067bc0..e010ed2 100644 --- 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 |