e_padlock.c: update from HEAD.
This commit is contained in:
parent
8355647403
commit
c65db618bb
@ -123,16 +123,16 @@ 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... */
|
||||
#include <stdlib.h>
|
||||
#ifdef _WIN32
|
||||
# include <malloc.h>
|
||||
# ifndef alloca
|
||||
# define alloca _alloca
|
||||
# endif
|
||||
#elif defined(NETWARE_CLIB) && defined(__GNUC__)
|
||||
void *alloca(size_t);
|
||||
# define alloca(s) __builtin_alloca(s)
|
||||
#else
|
||||
# include <stdlib.h>
|
||||
#elif defined(__GNUC__)
|
||||
# ifndef alloca
|
||||
# define alloca(s) __builtin_alloca(s)
|
||||
# endif
|
||||
#endif
|
||||
|
||||
/* Function for ENGINE detection and control */
|
||||
@ -1221,6 +1221,7 @@ OPENSSL_EXPORT
|
||||
int bind_engine(ENGINE *e, const char *id, const dynamic_fns *fns) { return 0; }
|
||||
IMPLEMENT_DYNAMIC_CHECK_FN()
|
||||
#endif
|
||||
#endif /* COMPILE_HW_PADLOCK */
|
||||
|
||||
#endif /* !OPENSSL_NO_HW_PADLOCK */
|
||||
#endif /* !OPENSSL_NO_HW */
|
||||
|
Loading…
x
Reference in New Issue
Block a user