diff options
author | giovanni <> | 2014-04-24 18:35:25 +0000 |
---|---|---|
committer | giovanni <> | 2014-04-24 18:35:25 +0000 |
commit | 64c969d7399fc33e3cb4cea18c0b1d5be97515b1 (patch) | |
tree | bf224f3ef70a5a4e5f5a12e6fb7059cdb33129bb /src/lib | |
parent | c963e3b0fb9c6db63183e97f988bfc8cf481b7fa (diff) | |
download | openbsd-64c969d7399fc33e3cb4cea18c0b1d5be97515b1.tar.gz openbsd-64c969d7399fc33e3cb4cea18c0b1d5be97515b1.tar.bz2 openbsd-64c969d7399fc33e3cb4cea18c0b1d5be97515b1.zip |
unifdef MSDOS
ok miod@
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/libcrypto/des/des_locl.h | 13 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/des/des_locl.h | 13 |
2 files changed, 2 insertions, 24 deletions
diff --git a/src/lib/libcrypto/des/des_locl.h b/src/lib/libcrypto/des/des_locl.h index 00fcd2a8ac..1b0c53038c 100644 --- a/src/lib/libcrypto/des/des_locl.h +++ b/src/lib/libcrypto/des/des_locl.h | |||
@@ -61,11 +61,6 @@ | |||
61 | 61 | ||
62 | #include <openssl/e_os2.h> | 62 | #include <openssl/e_os2.h> |
63 | 63 | ||
64 | #if defined(OPENSSL_SYS_WIN32) | ||
65 | #ifndef OPENSSL_SYS_MSDOS | ||
66 | #define OPENSSL_SYS_MSDOS | ||
67 | #endif | ||
68 | #endif | ||
69 | 64 | ||
70 | #include <stdio.h> | 65 | #include <stdio.h> |
71 | #include <stdlib.h> | 66 | #include <stdlib.h> |
@@ -74,14 +69,8 @@ | |||
74 | #include <math.h> | 69 | #include <math.h> |
75 | #include <openssl/des.h> | 70 | #include <openssl/des.h> |
76 | 71 | ||
77 | #ifdef OPENSSL_SYS_MSDOS /* Visual C++ 2.1 (Windows NT/95) */ | ||
78 | #include <stdlib.h> | ||
79 | #include <errno.h> | ||
80 | #include <time.h> | ||
81 | #include <io.h> | ||
82 | #endif | ||
83 | 72 | ||
84 | #if defined(__STDC__) || defined(OPENSSL_SYS_VMS) || defined(M_XENIX) || defined(OPENSSL_SYS_MSDOS) | 73 | #if defined(__STDC__) |
85 | #include <string.h> | 74 | #include <string.h> |
86 | #endif | 75 | #endif |
87 | 76 | ||
diff --git a/src/lib/libssl/src/crypto/des/des_locl.h b/src/lib/libssl/src/crypto/des/des_locl.h index 00fcd2a8ac..1b0c53038c 100644 --- a/src/lib/libssl/src/crypto/des/des_locl.h +++ b/src/lib/libssl/src/crypto/des/des_locl.h | |||
@@ -61,11 +61,6 @@ | |||
61 | 61 | ||
62 | #include <openssl/e_os2.h> | 62 | #include <openssl/e_os2.h> |
63 | 63 | ||
64 | #if defined(OPENSSL_SYS_WIN32) | ||
65 | #ifndef OPENSSL_SYS_MSDOS | ||
66 | #define OPENSSL_SYS_MSDOS | ||
67 | #endif | ||
68 | #endif | ||
69 | 64 | ||
70 | #include <stdio.h> | 65 | #include <stdio.h> |
71 | #include <stdlib.h> | 66 | #include <stdlib.h> |
@@ -74,14 +69,8 @@ | |||
74 | #include <math.h> | 69 | #include <math.h> |
75 | #include <openssl/des.h> | 70 | #include <openssl/des.h> |
76 | 71 | ||
77 | #ifdef OPENSSL_SYS_MSDOS /* Visual C++ 2.1 (Windows NT/95) */ | ||
78 | #include <stdlib.h> | ||
79 | #include <errno.h> | ||
80 | #include <time.h> | ||
81 | #include <io.h> | ||
82 | #endif | ||
83 | 72 | ||
84 | #if defined(__STDC__) || defined(OPENSSL_SYS_VMS) || defined(M_XENIX) || defined(OPENSSL_SYS_MSDOS) | 73 | #if defined(__STDC__) |
85 | #include <string.h> | 74 | #include <string.h> |
86 | #endif | 75 | #endif |
87 | 76 | ||