diff options
Diffstat (limited to 'src/lib/libssl/src/crypto/des/read_pwd.c')
-rw-r--r-- | src/lib/libssl/src/crypto/des/read_pwd.c | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/src/lib/libssl/src/crypto/des/read_pwd.c b/src/lib/libssl/src/crypto/des/read_pwd.c index fed49652c0..fa2d67da64 100644 --- a/src/lib/libssl/src/crypto/des/read_pwd.c +++ b/src/lib/libssl/src/crypto/des/read_pwd.c | |||
@@ -58,7 +58,11 @@ | |||
58 | 58 | ||
59 | #if !defined(MSDOS) && !defined(VMS) && !defined(WIN32) | 59 | #if !defined(MSDOS) && !defined(VMS) && !defined(WIN32) |
60 | #include <openssl/opensslconf.h> | 60 | #include <openssl/opensslconf.h> |
61 | #include OPENSSL_UNISTD | 61 | #ifdef OPENSSL_UNISTD |
62 | # include OPENSSL_UNISTD | ||
63 | #else | ||
64 | # include <unistd.h> | ||
65 | #endif | ||
62 | /* If unistd.h defines _POSIX_VERSION, we conclude that we | 66 | /* If unistd.h defines _POSIX_VERSION, we conclude that we |
63 | * are on a POSIX system and have sigaction and termios. */ | 67 | * are on a POSIX system and have sigaction and termios. */ |
64 | #if defined(_POSIX_VERSION) | 68 | #if defined(_POSIX_VERSION) |
@@ -123,7 +127,7 @@ | |||
123 | #undef SGTTY | 127 | #undef SGTTY |
124 | #endif | 128 | #endif |
125 | 129 | ||
126 | #if !defined(TERMIO) && !defined(TERMIOS) && !defined(VMS) && !defined(MSDOS) | 130 | #if !defined(TERMIO) && !defined(TERMIOS) && !defined(VMS) && !defined(MSDOS) && !defined(MAC_OS_pre_X) && !defined(MAC_OS_GUSI_SOURCE) |
127 | #undef TERMIOS | 131 | #undef TERMIOS |
128 | #undef TERMIO | 132 | #undef TERMIO |
129 | #define SGTTY | 133 | #define SGTTY |
@@ -153,7 +157,7 @@ | |||
153 | #define TTY_set(tty,data) ioctl(tty,TIOCSETP,data) | 157 | #define TTY_set(tty,data) ioctl(tty,TIOCSETP,data) |
154 | #endif | 158 | #endif |
155 | 159 | ||
156 | #if !defined(_LIBC) && !defined(MSDOS) && !defined(VMS) | 160 | #if !defined(_LIBC) && !defined(MSDOS) && !defined(VMS) && !defined(MAC_OS_pre_X) |
157 | #include <sys/ioctl.h> | 161 | #include <sys/ioctl.h> |
158 | #endif | 162 | #endif |
159 | 163 | ||
@@ -174,6 +178,15 @@ struct IOSB { | |||
174 | }; | 178 | }; |
175 | #endif | 179 | #endif |
176 | 180 | ||
181 | #if defined(MAC_OS_pre_X) || defined(MAC_OS_GUSI_SOURCE) | ||
182 | /* | ||
183 | * This one needs work. As a matter of fact the code is unoperational | ||
184 | * and this is only a trick to get it compiled. | ||
185 | * <appro@fy.chalmers.se> | ||
186 | */ | ||
187 | #define TTY_STRUCT int | ||
188 | #endif | ||
189 | |||
177 | #ifndef NX509_SIG | 190 | #ifndef NX509_SIG |
178 | #define NX509_SIG 32 | 191 | #define NX509_SIG 32 |
179 | #endif | 192 | #endif |