From: Ulf Möller <ulf@openssl.org>
Date: Mon, 15 May 2000 18:59:55 +0000 (+0000)
Subject: MacOS changes.
X-Git-Tag: OpenSSL_0_9_5~33
X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=991f0706d874c15fed9fd9e6490c4ecb89ae3cf6;ds=sidebyside

MacOS changes.
---

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)
diff --git a/e_os.h b/e_os.h
index dc28cd6171..0c84e7328a 100644
--- 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