ifdef cleanup part 3: OPENSSL_SYSNAME

[openssl.git] / e_os2.h

diff --git a/e_os2.h b/e_os2.h
index ecc0202b2cad97a4215933d36544ec61967c8391..12bad8acc405570bea3458513f0e97307961e1a5 100644 (file)
--- a/e_os2.h
+++ b/e_os2.h
@@ -71,7 +71,7 @@ extern "C" {
 # define OPENSSL_SYS_UNIX
 
 /* ---------------------- NetWare ----------------------------------------- */
-# if defined(NETWARE) || defined(OPENSSL_SYSNAME_NETWARE)
+# if defined(NETWARE) && !defined(OPENSSL_SYS_NETWARE)
 #  undef OPENSSL_SYS_UNIX
 #  define OPENSSL_SYS_NETWARE
 # endif
@@ -82,34 +82,33 @@ extern "C" {
  * Note that MSDOS actually denotes 32-bit environments running on top of
  * MS-DOS, such as DJGPP one.
  */
-# if defined(OPENSSL_SYSNAME_MSDOS)
+# if defined(OPENSSL_SYS_MSDOS)
 #  undef OPENSSL_SYS_UNIX
-#  define OPENSSL_SYS_MSDOS
 # endif
 
 /*
  * For 32 bit environment, there seems to be the CygWin environment and then
  * all the others that try to do the same thing Microsoft does...
  */
-# if defined(OPENSSL_SYSNAME_UWIN)
+# if defined(OPENSSL_SYS_UWIN)
 #  undef OPENSSL_SYS_UNIX
 #  define OPENSSL_SYS_WIN32_UWIN
 # else
-#  if defined(__CYGWIN__) || defined(OPENSSL_SYSNAME_CYGWIN)
+#  if defined(__CYGWIN__) || defined(OPENSSL_SYS_CYGWIN)
 #   undef OPENSSL_SYS_UNIX
 #   define OPENSSL_SYS_WIN32_CYGWIN
 #  else
-#   if defined(_WIN32) || defined(OPENSSL_SYSNAME_WIN32)
+#   if defined(_WIN32) || defined(OPENSSL_SYS_WIN32)
 #    undef OPENSSL_SYS_UNIX
-#    define OPENSSL_SYS_WIN32
+#    if !defined(OPENSSL_SYS_WIN32)
+#     define OPENSSL_SYS_WIN32
+#    endif
 #   endif
-#   if defined(OPENSSL_SYSNAME_WINNT)
+#   if defined(OPENSSL_SYS_WINNT)
 #    undef OPENSSL_SYS_UNIX
-#    define OPENSSL_SYS_WINNT
 #   endif
-#   if defined(OPENSSL_SYSNAME_WINCE)
+#   if defined(OPENSSL_SYS_WINCE)
 #    undef OPENSSL_SYS_UNIX
-#    define OPENSSL_SYS_WINCE
 #   endif
 #  endif
 # endif
@@ -138,8 +137,10 @@ extern "C" {
 # endif
 
 /* ------------------------------- OpenVMS -------------------------------- */
-# if defined(__VMS) || defined(VMS) || defined(OPENSSL_SYSNAME_VMS)
-#  undef OPENSSL_SYS_UNIX
+# if defined(__VMS) || defined(VMS) || defined(OPENSSL_SYS_VMS)
+#  if !defined(OPENSSL_SYS_VMS)
+#   undef OPENSSL_SYS_UNIX
+#  endif
 #  define OPENSSL_SYS_VMS
 #  if defined(__DECC)
 #   define OPENSSL_SYS_VMS_DECC
@@ -159,25 +160,16 @@ extern "C" {
 
 /* -------------------------------- Unix ---------------------------------- */
 # ifdef OPENSSL_SYS_UNIX
-#  if defined(linux) || defined(__linux__) || defined(OPENSSL_SYSNAME_LINUX)
+#  if defined(linux) || defined(__linux__) && !defined(OPENSSL_SYS_LINUX)
 #   define OPENSSL_SYS_LINUX
 #  endif
-#  ifdef OPENSSL_SYSNAME_SNI
-#   define OPENSSL_SYS_SNI
-#  endif
-#  ifdef OPENSSL_SYSNAME_ULTRASPARC
-#   define OPENSSL_SYS_ULTRASPARC
-#  endif
-#  ifdef OPENSSL_SYSNAME_MACOSX
-#   define OPENSSL_SYS_MACOSX
-#  endif
-#  if defined(_AIX) || defined(OPENSSL_SYSNAME_AIX)
+#  if defined(_AIX) && !defined(OPENSSL_SYS_AIX)
 #   define OPENSSL_SYS_AIX
 #  endif
 # endif
 
 /* -------------------------------- VOS ----------------------------------- */
-# if defined(__VOS__) || defined(OPENSSL_SYSNAME_VOS)
+# if defined(__VOS__) && !defined(OPENSSL_SYS_VOS)
 #  define OPENSSL_SYS_VOS
 #  ifdef __HPPA__
 #   define OPENSSL_SYS_VOS_HPPA
@@ -187,11 +179,6 @@ extern "C" {
 #  endif
 # endif
 
-/* ------------------------------ VxWorks --------------------------------- */
-# ifdef OPENSSL_SYSNAME_VXWORKS
-#  define OPENSSL_SYS_VXWORKS
-# endif
-
 /**
  * That's it for OS-specific stuff
  *****************************************************************************/