diff options
| -rw-r--r-- | apps/s_client.c | 2 | ||||
| -rw-r--r-- | apps/s_socket.c | 3 | ||||
| -rw-r--r-- | crypto/des/read_pwd.c | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/apps/s_client.c b/apps/s_client.c index 7140f8ba2b..21c4cac90c 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -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); diff --git a/apps/s_socket.c b/apps/s_socket.c index 56204e0be2..158014094f 100644 --- a/apps/s_socket.c +++ b/apps/s_socket.c @@ -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) diff --git a/crypto/des/read_pwd.c b/crypto/des/read_pwd.c index 45f66b5da1..ac6a548fc3 100644 --- a/crypto/des/read_pwd.c +++ b/crypto/des/read_pwd.c @@ -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. */ |