summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/des
diff options
context:
space:
mode:
authormiod <>2014-04-17 21:17:12 +0000
committermiod <>2014-04-17 21:17:12 +0000
commitaa8f085033b21b0ec0b70c18909ba27ef8752e51 (patch)
treeda9109a7546d5e98b8647a37cc675d8b776d00ad /src/lib/libcrypto/des
parente3644ed49258ff4a399142bf4ed0a7ba5f9bf76a (diff)
downloadopenbsd-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/des')
-rw-r--r--src/lib/libcrypto/des/des_locl.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/lib/libcrypto/des/des_locl.h b/src/lib/libcrypto/des/des_locl.h
index cf7811041e..bbae457377 100644
--- a/src/lib/libcrypto/des/des_locl.h
+++ b/src/lib/libcrypto/des/des_locl.h
@@ -152,9 +152,7 @@
152 } \ 152 } \
153 } 153 }
154 154
155#if (defined(OPENSSL_SYS_WIN32) && defined(_MSC_VER)) || defined(__ICC) 155#if defined(__GNUC__) && __GNUC__>=2 && !defined(__STRICT_ANSI__) && !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM) && !defined(PEDANTIC)
156#define ROTATE(a,n) (_lrotr(a,n))
157#elif defined(__GNUC__) && __GNUC__>=2 && !defined(__STRICT_ANSI__) && !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM) && !defined(PEDANTIC)
158# if defined(__i386) || defined(__i386__) || defined(__x86_64) || defined(__x86_64__) 156# if defined(__i386) || defined(__i386__) || defined(__x86_64) || defined(__x86_64__)
159# define ROTATE(a,n) ({ register unsigned int ret; \ 157# define ROTATE(a,n) ({ register unsigned int ret; \
160 asm ("rorl %1,%0" \ 158 asm ("rorl %1,%0" \