diff options
author | miod <> | 2014-04-17 21:17:12 +0000 |
---|---|---|
committer | miod <> | 2014-04-17 21:17:12 +0000 |
commit | aa8f085033b21b0ec0b70c18909ba27ef8752e51 (patch) | |
tree | da9109a7546d5e98b8647a37cc675d8b776d00ad /src/lib/libcrypto/whrlpool | |
parent | e3644ed49258ff4a399142bf4ed0a7ba5f9bf76a (diff) | |
download | openbsd-aa8f085033b21b0ec0b70c18909ba27ef8752e51.tar.gz openbsd-aa8f085033b21b0ec0b70c18909ba27ef8752e51.tar.bz2 openbsd-aa8f085033b21b0ec0b70c18909ba27ef8752e51.zip |
Get rid of MS Visual C compiler and Intel C compiler specific defines.
Diffstat (limited to 'src/lib/libcrypto/whrlpool')
-rw-r--r-- | src/lib/libcrypto/whrlpool/wp_block.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/lib/libcrypto/whrlpool/wp_block.c b/src/lib/libcrypto/whrlpool/wp_block.c index ce977083ad..fadad01401 100644 --- a/src/lib/libcrypto/whrlpool/wp_block.c +++ b/src/lib/libcrypto/whrlpool/wp_block.c | |||
@@ -77,12 +77,7 @@ typedef unsigned long long u64; | |||
77 | #endif | 77 | #endif |
78 | 78 | ||
79 | #undef ROTATE | 79 | #undef ROTATE |
80 | #if defined(_MSC_VER) | 80 | #if defined(__GNUC__) && __GNUC__>=2 |
81 | # if defined(_WIN64) /* applies to both IA-64 and AMD64 */ | ||
82 | # pragma intrinsic(_rotl64) | ||
83 | # define ROTATE(a,n) _rotl64((a),n) | ||
84 | # endif | ||
85 | #elif defined(__GNUC__) && __GNUC__>=2 | ||
86 | # if defined(__x86_64) || defined(__x86_64__) | 81 | # if defined(__x86_64) || defined(__x86_64__) |
87 | # define ROTATE(a,n) ({ u64 ret; asm ("rolq %1,%0" \ | 82 | # define ROTATE(a,n) ({ u64 ret; asm ("rolq %1,%0" \ |
88 | : "=r"(ret) : "J"(n),"0"(a) : "cc"); ret; }) | 83 | : "=r"(ret) : "J"(n),"0"(a) : "cc"); ret; }) |