Fix build failure on Windows due to undefined cflags identifier

[oweals/openssl.git] / apps / s_socket.c

diff --git a/apps/s_socket.c b/apps/s_socket.c
index 093b9c82ad478aa7de09f008cb1a357582c31a4a..f44050db401873d93c93a6a5a342ea5d648e8238 100644 (file)
--- a/apps/s_socket.c
+++ b/apps/s_socket.c
@@ -178,7 +178,12 @@ static void sock_cleanup(void)
 
 static int ssl_sock_init(void)
        {
-#if defined(OPENSSL_SYS_WINDOWS)
+#ifdef WATT32
+       extern int _watt_do_exit;
+       _watt_do_exit = 0;
+       if (sock_init())
+               return (0);
+#elif defined(OPENSSL_SYS_WINDOWS)
        if (!wsa_init_done)
                {
                int err;
@@ -264,7 +269,7 @@ static int init_client_ip(int *sock, const unsigned char ip[4], int port,
                        
        if (s == INVALID_SOCKET) { perror("socket"); return(0); }
 
-#if defined(SO_KEEPALIVE) && !defined(OPENSSL_SYS_MPE)
+#if defined(SO_KEEPALIVE)
        if (type == SOCK_STREAM)
                {
                i=0;
@@ -527,7 +532,7 @@ redoit:
                return(0);
                }
 
-/*
+/*-
        ling.l_onoff=1;
        ling.l_linger=0;
        i=setsockopt(ret,SOL_SOCKET,SO_LINGER,(char *)&ling,sizeof(ling));