summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorBodo Möller <bodo@openssl.org>1999-04-14 20:17:23 +0000
committerBodo Möller <bodo@openssl.org>1999-04-14 20:17:23 +0000
commitf0f1b4e400ddbd8155a074ea74e7edbb32cb2d17 (patch)
tree9e2b9f4f49926df50b9c07714e7aa6bbba565caa /apps
parent8f7de4f04cb16528386cb126d28ea3dc0a0c6a10 (diff)
Some tiny fixes.
Submitted by: Reviewed by: PR: Submitted by: Reviewed by: PR:
Diffstat (limited to 'apps')
-rw-r--r--apps/s_client.c2
-rw-r--r--apps/s_socket.c3
2 files changed, 3 insertions, 2 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)