diff options
| -rw-r--r-- | crypto/des/read_pwd.c | 12 | ||||
| -rw-r--r-- | e_os.h | 1 |
2 files changed, 8 insertions, 5 deletions
diff --git a/crypto/des/read_pwd.c b/crypto/des/read_pwd.c index fa2d67da64..789493f0c9 100644 --- a/crypto/des/read_pwd.c +++ b/crypto/des/read_pwd.c @@ -265,13 +265,15 @@ int des_read_pw(char *buf, char *buff, int size, const char *prompt, is_a_tty=1; tty=NULL; -#ifndef MSDOS - if ((tty=fopen("/dev/tty","r")) == NULL) - tty=stdin; -#else /* MSDOS */ +#ifdef MSDOS if ((tty=fopen("con","r")) == NULL) tty=stdin; -#endif /* MSDOS */ +#elif defined(MAC_OS_pre_X) + tty=stdin; +#else + if ((tty=fopen("/dev/tty","r")) == NULL) + tty=stdin; +#endif #if defined(TTY_get) && !defined(VMS) if (TTY_get(fileno(tty),&tty_orig) == -1) @@ -87,6 +87,7 @@ extern "C" { # ifndef MAC_OS_GUSI_SOURCE # define MAC_OS_pre_X # define NO_SYS_TYPES_H + typedef long ssize_t; # endif # define NO_SYS_PARAM_H # define NO_CHMOD |