MacOS changes.

diff --git a/crypto/des/read_pwd.c b/crypto/des/read_pwd.c
index fa2d67da643f11de4a55dbd2d94306d89b3025a6..789493f0c9611fd78af6462587eef89fc1afa966 100644 (file)
--- 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)

diff --git a/e_os.h b/e_os.h
index dc28cd6171edf0fb78c21126c58857148e67f5f8..0c84e7328add23e1ca5bdfb89facdb07c64597ac 100644 (file)
--- a/e_os.h
+++ b/e_os.h
@@ -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