diff options
| author | Rich Salz <rsalz@akamai.com> | 2014-08-08 16:46:14 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@akamai.com> | 2014-08-08 16:54:14 -0400 |
| commit | a90081576c94f9f54de1755188a00ccc1760549a (patch) | |
| tree | dffbe450e39181c15a9ef5422cbed5916f8af161 /apps | |
| parent | 0989790b87efcfd40ae6770f11af28a005df28ac (diff) | |
| download | openssl-a90081576c94f9f54de1755188a00ccc1760549a.tar.gz | |
Remove DJGPP (and therefore WATT32) #ifdef's.
DJGPP is no longer a supported platform. Remove all #ifdef, etc.,
cases that refer to it. DJGPP also #define'd WATT32, so that
is now removed as well.
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/s_client.c | 7 | ||||
| -rw-r--r-- | apps/s_server.c | 2 | ||||
| -rw-r--r-- | apps/s_socket.c | 7 |
3 files changed, 2 insertions, 14 deletions
diff --git a/apps/s_client.c b/apps/s_client.c index e1be6a908b..1948328927 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -308,9 +308,6 @@ static void sc_usage(void) BIO_printf(bio_err," -prexit - print session information even on connection failure\n"); BIO_printf(bio_err," -showcerts - show all certificates in the chain\n"); BIO_printf(bio_err," -debug - extra output\n"); -#ifdef WATT32 - BIO_printf(bio_err," -wdebug - WATT-32 tcp debugging\n"); -#endif BIO_printf(bio_err," -msg - Show protocol messages\n"); BIO_printf(bio_err," -nbio_test - more ssl protocol testing\n"); BIO_printf(bio_err," -state - print the 'ssl' states\n"); @@ -831,10 +828,6 @@ static char *jpake_secret = NULL; else if (strcmp(*argv,"-status") == 0) c_status_req=1; #endif -#ifdef WATT32 - else if (strcmp(*argv,"-wdebug") == 0) - dbug_init(); -#endif else if (strcmp(*argv,"-msg") == 0) c_msg=1; else if (strcmp(*argv,"-msgfile") == 0) diff --git a/apps/s_server.c b/apps/s_server.c index 639bb90c59..4b93fdefa2 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -3366,7 +3366,7 @@ static int rev_body(char *hostname, int s, int stype, unsigned char *context) BIO_printf(bio_s_out,"read R BLOCK\n"); #if defined(OPENSSL_SYS_NETWARE) delay(1000); -#elif !defined(OPENSSL_SYS_MSDOS) && !defined(__DJGPP__) +#elif !defined(OPENSSL_SYS_MSDOS) sleep(1); #endif continue; diff --git a/apps/s_socket.c b/apps/s_socket.c index e83baf4e70..093b9c82ad 100644 --- a/apps/s_socket.c +++ b/apps/s_socket.c @@ -178,12 +178,7 @@ static void sock_cleanup(void) static int ssl_sock_init(void) { -#ifdef WATT32 - extern int _watt_do_exit; - _watt_do_exit = 0; - if (sock_init()) - return (0); -#elif defined(OPENSSL_SYS_WINDOWS) +#if defined(OPENSSL_SYS_WINDOWS) if (!wsa_init_done) { int err; |