diff options
| author | Rich Salz <rsalz@akamai.com> | 2014-08-09 14:02:20 +0200 |
|---|---|---|
| committer | Rich Salz <rsalz@akamai.com> | 2014-08-09 14:02:20 +0200 |
| commit | f642ebc1e2dca34bc2b3c46796c131e1f5077bee (patch) | |
| tree | a8f54bb26068ebd4bf5a1ef4684ab98758cebc4f /apps/s_socket.c | |
| parent | RT 1988: Add "const" to SSL_use_RSAPrivateKey_ASN1 (diff) | |
| download | openssl-f642ebc1e2dca34bc2b3c46796c131e1f5077bee.tar.xz openssl-f642ebc1e2dca34bc2b3c46796c131e1f5077bee.zip | |
Undo a90081576c94f9f54de1755188a00ccc1760549a
Undo unapproved commit that removed DJGPP and WATT32
Diffstat (limited to 'apps/s_socket.c')
| -rw-r--r-- | apps/s_socket.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/apps/s_socket.c b/apps/s_socket.c index 093b9c82ad..e83baf4e70 100644 --- 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; |