diff options
| author | Rich Salz <rsalz@openssl.org> | 2016-03-17 12:53:11 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-03-17 17:06:57 -0400 |
| commit | 1fbab1dc6fcb14f512a40c5755708a8bcbf84f40 (patch) | |
| tree | a54f0b0b24b2a5af56e3f3e533e0a5c7063266bd /include | |
| parent | 014267f68ce98cfe61df4574552043fbbd144a1f (diff) | |
Remove Netware and OS/2
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/bio.h | 2 | ||||
| -rw-r--r-- | include/openssl/e_os2.h | 12 | ||||
| -rw-r--r-- | include/openssl/symhacks.h | 2 |
3 files changed, 1 insertions, 15 deletions
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 <openssl/e_os2.h> /* 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 |