Some tiny fixes.
authorBodo Möller <bodo@openssl.org>
Wed, 14 Apr 1999 20:17:23 +0000 (20:17 +0000)
committerBodo Möller <bodo@openssl.org>
Wed, 14 Apr 1999 20:17:23 +0000 (20:17 +0000)
Submitted by:
Reviewed by:
PR:

Submitted by:
Reviewed by:
PR:

apps/s_client.c
apps/s_socket.c
crypto/des/read_pwd.c

index 7140f8b..21c4cac 100644 (file)
@@ -442,8 +442,8 @@ re_start:
                ssl_pending = read_ssl && SSL_pending(con);
 
                if (!ssl_pending)
-#ifndef WINDOWS
                        {
+#ifndef WINDOWS
                        if (tty_on)
                                {
                                if (read_tty)  FD_SET(fileno(stdin),&readfds);
index 56204e0..1580140 100644 (file)
@@ -345,7 +345,8 @@ char *ip;
 #if defined SOL_SOCKET && defined SO_REUSEADDR
                {
                int j = 1;
-               setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &j, sizeof j);
+               setsockopt(s, SOL_SOCKET, SO_REUSEADDR,
+                          (const void *) &j, sizeof j);
                }
 #endif
        if (bind(s,(struct sockaddr *)&server,sizeof(server)) == -1)
index 45f66b5..ac6a548 100644 (file)
@@ -56,7 +56,7 @@
  * [including the GNU Public Licence.]
  */
 
-#if !defined(MSDOS) && !defined(VMS)
+#if !defined(MSDOS) && !defined(VMS) && !defined(WIN32)
 #include <unistd.h>
 /* If unistd.h defines _POSIX_VERSION, we conclude that we
  * are on a POSIX system and have sigaction and termios. */