summaryrefslogtreecommitdiffstats
path: root/crypto/des/des_locl.h
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2001-02-19 16:06:34 +0000
committerRichard Levitte <levitte@openssl.org>2001-02-19 16:06:34 +0000
commitcf1b7d96647d55e533f779e476e3d4371f40445a (patch)
treef7d6534cf77223190eaefe68d9e192d3d1246206 /crypto/des/des_locl.h
parent649c5a2b096e89692b07dbbe19d2dbb12a9db075 (diff)
Make all configuration macros available for application by making
sure they are available in opensslconf.h, by giving them names starting with "OPENSSL_" to avoid conflicts with other packages and by making sure e_os2.h will cover all platform-specific cases together with opensslconf.h. I've checked fairly well that nothing breaks with this (apart from external software that will adapt if they have used something like NO_KRB5), but I can't guarantee it completely, so a review of this change would be a good thing.
Diffstat (limited to 'crypto/des/des_locl.h')
-rw-r--r--crypto/des/des_locl.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/des/des_locl.h b/crypto/des/des_locl.h
index 6b4da958a8..c75bc52c7a 100644
--- a/crypto/des/des_locl.h
+++ b/crypto/des/des_locl.h
@@ -59,7 +59,7 @@
#ifndef HEADER_DES_LOCL_H
#define HEADER_DES_LOCL_H
-#if defined(WIN32) || defined(WIN16)
+#if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_WIN16)
#ifndef MSDOS
#define MSDOS
#endif
@@ -160,7 +160,7 @@
} \
}
-#if defined(WIN32) && defined(_MSC_VER)
+#if defined(OPENSSL_SYS_WIN32) && defined(_MSC_VER)
#define ROTATE(a,n) (_lrotr(a,n))
#else
#define ROTATE(a,n) (((a)>>(n))+((a)<<(32-(n))))