diff options
| author | miod <> | 2014-04-28 21:14:50 +0000 |
|---|---|---|
| committer | miod <> | 2014-04-28 21:14:50 +0000 |
| commit | 5c80b04ad533e531e552e7e775b6df48dd1fcecc (patch) | |
| tree | c38bc7b3eb96fe7a9e0e0ce7390f75e6feb8fc91 /src/lib/libcrypto/modes | |
| parent | 491ced77fa72fcec5b39051ff934a325810e0dd9 (diff) | |
| download | openbsd-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/modes')
| -rw-r--r-- | src/lib/libcrypto/modes/modes_lcl.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/lib/libcrypto/modes/modes_lcl.h b/src/lib/libcrypto/modes/modes_lcl.h index 2fc8138273..68c0e355ad 100644 --- a/src/lib/libcrypto/modes/modes_lcl.h +++ b/src/lib/libcrypto/modes/modes_lcl.h | |||
| @@ -9,11 +9,7 @@ | |||
| 9 | #include <machine/endian.h> | 9 | #include <machine/endian.h> |
| 10 | 10 | ||
| 11 | 11 | ||
| 12 | #if (defined(_WIN32) || defined(_WIN64)) && !defined(__MINGW32__) | 12 | #if defined(_LP64) |
| 13 | typedef __int64 i64; | ||
| 14 | typedef unsigned __int64 u64; | ||
| 15 | #define U64(C) C##UI64 | ||
| 16 | #elif defined(__arch64__) | ||
| 17 | typedef long i64; | 13 | typedef long i64; |
| 18 | typedef unsigned long u64; | 14 | typedef unsigned long u64; |
| 19 | #define U64(C) C##UL | 15 | #define U64(C) C##UL |