Commit 6f9bafaf authored by Richard Levitte's avatar Richard Levitte
Browse files

- 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.
parent 422a4a33

crypto/engine/eng_padlock.c

+10 −5
Original line number Diff line number Diff line
@@ -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