summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/engine/eng_padlock.c
diff options
context:
space:
mode:
authormiod <>2014-04-28 21:14:50 +0000
committermiod <>2014-04-28 21:14:50 +0000
commit5c80b04ad533e531e552e7e775b6df48dd1fcecc (patch)
treec38bc7b3eb96fe7a9e0e0ce7390f75e6feb8fc91 /src/lib/libcrypto/engine/eng_padlock.c
parent491ced77fa72fcec5b39051ff934a325810e0dd9 (diff)
downloadopenbsd-5c80b04ad533e531e552e7e775b6df48dd1fcecc.tar.gz
openbsd-5c80b04ad533e531e552e7e775b6df48dd1fcecc.tar.bz2
openbsd-5c80b04ad533e531e552e7e775b6df48dd1fcecc.zip
Remove WIN32, WIN64 and MINGW32 tentacles.
Also check for _LP64 rather than __arch64__ (the former being more reliable than __LP64__ or __arch64__) to tell 64-bit int platforms apart from 32-bit int platforms. Loosely based upon a diff from Martijn van Duren on tech@
Diffstat (limited to 'src/lib/libcrypto/engine/eng_padlock.c')
-rw-r--r--src/lib/libcrypto/engine/eng_padlock.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/lib/libcrypto/engine/eng_padlock.c b/src/lib/libcrypto/engine/eng_padlock.c
index c27181ba75..5a80b2b16d 100644
--- a/src/lib/libcrypto/engine/eng_padlock.c
+++ b/src/lib/libcrypto/engine/eng_padlock.c
@@ -129,12 +129,7 @@ void ENGINE_load_padlock (void)
129/* We do these includes here to avoid header problems on platforms that 129/* We do these includes here to avoid header problems on platforms that
130 do not have the VIA padlock anyway... */ 130 do not have the VIA padlock anyway... */
131#include <stdlib.h> 131#include <stdlib.h>
132#ifdef _WIN32 132#if defined(__GNUC__)
133# include <malloc.h>
134# ifndef alloca
135# define alloca _alloca
136# endif
137#elif defined(__GNUC__)
138# ifndef alloca 133# ifndef alloca
139# define alloca(s) __builtin_alloca(s) 134# define alloca(s) __builtin_alloca(s)
140# endif 135# endif