diff options
| author | Andy Polyakov <appro@openssl.org> | 2009-05-12 20:24:23 +0000 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2009-05-12 20:24:23 +0000 |
| commit | c65db618bb22edf4c85c5169949fb29ffa440e5e (patch) | |
| tree | 27ea87567b9736dfd30099d2ffaa5e4435ff72f0 /engines | |
| parent | 83556474039057219c58f11454b1f8b0a5d603e4 (diff) | |
| download | openssl-new-c65db618bb22edf4c85c5169949fb29ffa440e5e.tar.gz | |
e_padlock.c: update from HEAD.
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/e_padlock.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/engines/e_padlock.c b/engines/e_padlock.c index 4095513b7a..381a746058 100644 --- a/engines/e_padlock.c +++ b/engines/e_padlock.c @@ -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 */ |