undo Cygwin change

[oweals/openssl.git] / e_os2.h

diff --git a/e_os2.h b/e_os2.h
index 292ea1e2ac4507ff4ed661b8859d8847b9aa76f0..4ca79a4d65d82b92746082f2a020252e77da23ef 100644 (file)
--- a/e_os2.h
+++ b/e_os2.h
@@ -76,12 +76,6 @@ extern "C" {
 # define OPENSSL_SYS_MACINTOSH_CLASSIC
 #endif
 
-/* ----------------------- NetWare ----------------------------------------- */
-#if defined(NETWARE) || defined(OPENSSL_SYSNAME_NETWARE)
-# undef OPENSSL_SYS_UNIX
-# define OPENSSL_SYS_NETWARE
-#endif
-
 /* ---------------------- Microsoft operating systems ---------------------- */
 
 /* The 16 bit environments are pretty straightforward */
@@ -211,9 +205,6 @@ extern "C" {
 
 
 /* Specials for I/O an exit */
-#ifdef OPENSSL_SYS_WIN16
-# define OPENSSL_NO_FP_API
-#endif
 #ifdef OPENSSL_SYS_MSDOS
 # define OPENSSL_UNISTD_IO <io.h>
 # define OPENSSL_DECLARE_EXIT extern void exit(int);
@@ -257,7 +248,7 @@ extern "C" {
 #define OPENSSL_EXTERN OPENSSL_IMPORT
 
 /* Macros to allow global variables to be reached through function calls when
-   required (if a shared library version requvres it, for example.
+   required (if a shared library version requires it, for example.
    The way it's done allows definitions like this:
 
        // in foobar.c
@@ -268,7 +259,7 @@ extern "C" {
 */
 #ifdef OPENSSL_EXPORT_VAR_AS_FUNCTION
 # define OPENSSL_IMPLEMENT_GLOBAL(type,name)                        \
-       extern static type _hide_##name;                             \
+       extern type _hide_##name;                                    \
        type *_shadow_##name(void) { return &_hide_##name; }         \
        static type _hide_##name
 # define OPENSSL_DECLARE_GLOBAL(type,name) type *_shadow_##name(void)