From 1fbab1dc6fcb14f512a40c5755708a8bcbf84f40 Mon Sep 17 00:00:00 2001 From: Rich Salz Date: Thu, 17 Mar 2016 12:53:11 -0400 Subject: Remove Netware and OS/2 Reviewed-by: Richard Levitte --- include/openssl/bio.h | 2 -- include/openssl/e_os2.h | 12 ------------ include/openssl/symhacks.h | 2 +- 3 files changed, 1 insertion(+), 15 deletions(-) (limited to 'include') diff --git a/include/openssl/bio.h b/include/openssl/bio.h index ae59948389..06e1cbf792 100644 --- a/include/openssl/bio.h +++ b/include/openssl/bio.h @@ -672,9 +672,7 @@ BIO_METHOD *BIO_s_socket(void); BIO_METHOD *BIO_s_connect(void); BIO_METHOD *BIO_s_accept(void); BIO_METHOD *BIO_s_fd(void); -# ifndef OPENSSL_SYS_OS2 BIO_METHOD *BIO_s_log(void); -# endif BIO_METHOD *BIO_s_bio(void); BIO_METHOD *BIO_s_null(void); BIO_METHOD *BIO_f_null(void); diff --git a/include/openssl/e_os2.h b/include/openssl/e_os2.h index 15b3400f71..bbd6116f86 100644 --- a/include/openssl/e_os2.h +++ b/include/openssl/e_os2.h @@ -69,12 +69,6 @@ extern "C" { # define OPENSSL_SYS_UNIX -/* ---------------------- NetWare ----------------------------------------- */ -# if defined(NETWARE) && !defined(OPENSSL_SYS_NETWARE) -# undef OPENSSL_SYS_UNIX -# define OPENSSL_SYS_NETWARE -# endif - /* --------------------- Microsoft operating systems ---------------------- */ /* @@ -163,12 +157,6 @@ extern "C" { # endif # endif -/* -------------------------------- OS/2 ---------------------------------- */ -# if defined(__EMX__) || defined(__OS2__) -# undef OPENSSL_SYS_UNIX -# define OPENSSL_SYS_OS2 -# endif - /* -------------------------------- Unix ---------------------------------- */ # ifdef OPENSSL_SYS_UNIX # if defined(linux) || defined(__linux__) && !defined(OPENSSL_SYS_LINUX) diff --git a/include/openssl/symhacks.h b/include/openssl/symhacks.h index 394f91434e..99a2de5f41 100644 --- a/include/openssl/symhacks.h +++ b/include/openssl/symhacks.h @@ -58,7 +58,7 @@ # include /* Case insensitive linking causes problems.... */ -# if defined(OPENSSL_SYS_OS2) || defined(OPENSSL_SYS_VMS) +# if defined(OPENSSL_SYS_VMS) # undef ERR_load_CRYPTO_strings # define ERR_load_CRYPTO_strings ERR_load_CRYPTOlib_strings # undef OCSP_crlID_new -- cgit v1.2.3