diff options
| author | Rich Salz <rsalz@openssl.org> | 2014-09-24 12:18:19 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2014-09-24 18:07:29 -0400 |
| commit | 92c78463720f71e47c251ffa58493e32cd793e13 (patch) | |
| tree | 45b240a3c720a19f5e1767998b8c6d7d42cfb4b5 /crypto/des | |
| parent | 4aac102f75b517bdb56b1bcfd0a856052d559f6e (diff) | |
RT3544: Remove MWERKS support
The following #ifdef tests were all removed:
__MWERKS__
MAC_OS_pre_X
MAC_OS_GUSI_SOURCE
MAC_OS_pre_X
OPENSSL_SYS_MACINTOSH_CLASSIC
OPENSSL_SYS_MACOSX_RHAPSODY
Reviewed-by: Andy Polyakov <appro@openssl.org>
Diffstat (limited to 'crypto/des')
| -rw-r--r-- | crypto/des/read_pwd.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/crypto/des/read_pwd.c b/crypto/des/read_pwd.c index ce5fa00a37..7e3f9020dc 100644 --- a/crypto/des/read_pwd.c +++ b/crypto/des/read_pwd.c @@ -129,7 +129,7 @@ #undef SGTTY #endif -#if !defined(TERMIO) && !defined(TERMIOS) && !defined(OPENSSL_SYS_VMS) && !defined(OPENSSL_SYS_MSDOS) && !defined(MAC_OS_pre_X) && !defined(MAC_OS_GUSI_SOURCE) +#if !defined(TERMIO) && !defined(TERMIOS) && !defined(OPENSSL_SYS_VMS) && !defined(OPENSSL_SYS_MSDOS) #undef TERMIOS #undef TERMIO #define SGTTY @@ -165,7 +165,7 @@ #define TTY_set(tty,data) ioctl(tty,TIOCSETP,data) #endif -#if !defined(_LIBC) && !defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_VMS) && !defined(MAC_OS_pre_X) +#if !defined(_LIBC) && !defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_VMS) #include <sys/ioctl.h> #endif @@ -186,14 +186,6 @@ struct IOSB { }; #endif -#if defined(MAC_OS_pre_X) || defined(MAC_OS_GUSI_SOURCE) -/* - * This one needs work. As a matter of fact the code is unoperational - * and this is only a trick to get it compiled. - * <appro@fy.chalmers.se> - */ -#define TTY_STRUCT int -#endif #ifndef NX509_SIG #define NX509_SIG 32 @@ -294,7 +286,7 @@ int des_read_pw(char *buf, char *buff, int size, const char *prompt, #ifdef OPENSSL_SYS_MSDOS if ((tty=fopen("con","r")) == NULL) tty=stdin; -#elif defined(MAC_OS_pre_X) || defined(OPENSSL_SYS_VXWORKS) +#elif defined(OPENSSL_SYS_VXWORKS) tty=stdin; #else #ifndef OPENSSL_SYS_MPE |