From c69d1039561bd1be7d1efea47e2f525cfae86ed9 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Thu, 13 Jun 2002 21:44:23 +0000 Subject: [PATCH] Tentatively add support for UWIN, a Unix-like environment on top of Windows. PR: 62 --- Configure | 3 +++ e_os2.h | 21 +++++++++++++-------- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/Configure b/Configure index 35520b53c7..83c13493ae 100755 --- a/Configure +++ b/Configure @@ -509,6 +509,9 @@ my %table=( # and its library files in util/pl/*) "Mingw32", "gcc:-DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall:::::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::win32", +# UWIN +"UWIN", "cc:-DTERMIOS -DL_ENDIAN -O -Wall:::UWIN::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::win32", + # Cygwin "Cygwin-pre1.3", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown):CYGWIN32::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::win32", "Cygwin", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall:::CYGWIN32::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}:win32:cygwin-shared:::.dll", diff --git a/e_os2.h b/e_os2.h index 9c4a541728..ff68d5b94a 100644 --- a/e_os2.h +++ b/e_os2.h @@ -90,17 +90,22 @@ extern "C" { /* 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(__CYGWIN32__) || defined(OPENSSL_SYSNAME_CYGWIN32) +#if defined(OPENSSL_SYSNAME_UWIN) # undef OPENSSL_SYS_UNIX -# define OPENSSL_SYS_WIN32_CYGWIN +# define OPENSSL_SYS_WIN32_UWIN #else -# if defined(_WIN32) || defined(OPENSSL_SYSNAME_WIN32) +# if defined(__CYGWIN32__) || defined(OPENSSL_SYSNAME_CYGWIN32) # undef OPENSSL_SYS_UNIX -# define OPENSSL_SYS_WIN32 -# endif -# if defined(OPENSSL_SYSNAME_WINNT) -# undef OPENSSL_SYS_UNIX -# define OPENSSL_SYS_WINNT +# define OPENSSL_SYS_WIN32_CYGWIN +# else +# if defined(_WIN32) || defined(OPENSSL_SYSNAME_WIN32) +# undef OPENSSL_SYS_UNIX +# define OPENSSL_SYS_WIN32 +# endif +# if defined(OPENSSL_SYSNAME_WINNT) +# undef OPENSSL_SYS_UNIX +# define OPENSSL_SYS_WINNT +# endif # endif #endif -- 2.25.1