summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/aes
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/aes
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/aes')
-rw-r--r--src/lib/libcrypto/aes/aes_x86core.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/lib/libcrypto/aes/aes_x86core.c b/src/lib/libcrypto/aes/aes_x86core.c
index 295ea22bb4..8b3b29e28c 100644
--- a/src/lib/libcrypto/aes/aes_x86core.c
+++ b/src/lib/libcrypto/aes/aes_x86core.c
@@ -79,10 +79,7 @@ prefetch256(const void *table)
79#undef GETU32 79#undef GETU32
80#define GETU32(p) (*((u32*)(p))) 80#define GETU32(p) (*((u32*)(p)))
81 81
82#if (defined(_WIN32) || defined(_WIN64)) && !defined(__MINGW32__) 82#if defined(_LP64)
83typedef unsigned __int64 u64;
84#define U64(C) C##UI64
85#elif defined(__arch64__)
86typedef unsigned long u64; 83typedef unsigned long u64;
87#define U64(C) C##UL 84#define U64(C) C##UL
88#else 85#else