1 files changed, 1 insertions, 19 deletions

diff --git a/src/lib/libssl/src/apps/s_server.c b/src/lib/libssl/src/apps/s_server.c
index 4ad535b9ee..8d7568085a 100644
--- a/src/lib/libssl/src/apps/s_server.c
+++ b/src/lib/libssl/src/apps/s_server.c
@@ -157,9 +157,7 @@
 #define APPS_WIN16
 #endif
 
-#if !defined(OPENSSL_SYS_NETWARE)  /* conflicts with winsock2 stuff on netware */
 #include <sys/types.h>
-#endif
 
 #include <openssl/lhash.h>
 #include <openssl/bn.h>
@@ -183,9 +181,6 @@
 #include "s_apps.h"
 #include "timeouts.h"
 
-#if defined(OPENSSL_SYS_BEOS_R5)
-#include <fcntl.h>
-#endif
 
 #ifndef OPENSSL_NO_RSA
 static RSA *tmp_rsa_cb(SSL *s, int is_export, int keylength);
@@ -1947,17 +1942,6 @@ static int sv_body(char *hostname, int s, unsigned char *context)
                         if((i < 0) || (!i && !_kbhit() ) )continue;
                         if(_kbhit())
                                 read_from_terminal = 1;
-#elif defined(OPENSSL_SYS_BEOS_R5)
-                        /* Under BeOS-R5 the situation is similar to DOS */
-                        tv.tv_sec = 1;
-                        tv.tv_usec = 0;
-                        (void)fcntl(fileno(stdin), F_SETFL, O_NONBLOCK);
-                        i=select(width,(void *)&readfds,NULL,NULL,&tv);
-                        if ((i < 0) || (!i && read(fileno(stdin), buf, 0) < 0))
-                                continue;
-                        if (read(fileno(stdin), buf, 0) >= 0)
-                                read_from_terminal = 1;
-                        (void)fcntl(fileno(stdin), F_SETFL, 0);
 #else
                         if ((SSL_version(con) == DTLS1_VERSION) &&
                                 DTLSv1_get_timeout(con, &timeout))
@@ -2496,9 +2480,7 @@ static int www_body(char *hostname, int s, unsigned char *context)
                         else
                                 {
                                 BIO_printf(bio_s_out,"read R BLOCK\n");
-#if defined(OPENSSL_SYS_NETWARE)
-            delay(1000);
-#elif !defined(OPENSSL_SYS_MSDOS) && !defined(__DJGPP__)
+#if   !defined(OPENSSL_SYS_MSDOS) && !defined(__DJGPP__)
                                 sleep(1);
 #endif
                                 continue;