diff options
| author |   markus <markus@openbsd.org> | 2002-09-10 16:31:53 +0000 |
|---|---|---|
| committer | markus <markus@openbsd.org> | 2002-09-10 16:31:53 +0000 |
| commit | 1f9308f95cf5f2eb77b454500c9bb49d76673ef3 (patch) | |
| tree | c6825952eba2bd0bea9ff46656b25ab7eea8284b /lib/libssl/src/e_os2.h | |
| parent | Update list of supported CMD and Promise devices. (diff) | |
| download | wireguard-openbsd-1f9308f95cf5f2eb77b454500c9bb49d76673ef3.tar.xz wireguard-openbsd-1f9308f95cf5f2eb77b454500c9bb49d76673ef3.zip | |
merge openssl-0.9.7-beta3, tested on vax by miod@
Diffstat (limited to 'lib/libssl/src/e_os2.h')
| -rw-r--r-- | lib/libssl/src/e_os2.h | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/lib/libssl/src/e_os2.h b/lib/libssl/src/e_os2.h index 9c4a541728d..ff68d5b94aa 100644 --- a/lib/libssl/src/e_os2.h +++ b/lib/libssl/src/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 |