diff options
| author | Richard Levitte <levitte@openssl.org> | 2015-05-31 17:47:31 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2015-06-02 18:07:55 +0200 |
| commit | f9603f2673154bfba52d24654bc6e5f5dd19a88a (patch) | |
| tree | 933b270863ef203250479033bd80a1eefe99f0ef | |
| parent | 467daf6b6ef0753ccfc5c024c2f63c948354d698 (diff) | |
| download | openssl-new-f9603f2673154bfba52d24654bc6e5f5dd19a88a.tar.gz | |
Add the macro OPENSSL_SYS_WIN64
This is for consistency.
Additionally, have its presence define OPENSSL_SYS_WINDOWS as well.
Reviewed-by: Matt Caswell <matt@openssl.org>
(cherry picked from commit 3f131556d6678bc3754f1e6d98a9a5bfc24e368c)
Conflicts:
e_os2.h
| -rw-r--r-- | e_os2.h | 8 |
1 files changed, 7 insertions, 1 deletions
@@ -109,6 +109,12 @@ extern "C" { # undef OPENSSL_SYS_UNIX # define OPENSSL_SYS_WIN32 # endif +# if defined(_WIN64) || defined(OPENSSL_SYSNAME_WIN64) +# undef OPENSSL_SYS_UNIX +# if !defined(OPENSSL_SYS_WIN64) +# define OPENSSL_SYS_WIN64 +# endif +# endif # if defined(OPENSSL_SYSNAME_WINNT) # undef OPENSSL_SYS_UNIX # define OPENSSL_SYS_WINNT @@ -121,7 +127,7 @@ extern "C" { # endif /* Anything that tries to look like Microsoft is "Windows" */ -# if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_WINNT) || defined(OPENSSL_SYS_WINCE) +# if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_WIN64) || defined(OPENSSL_SYS_WINNT) || defined(OPENSSL_SYS_WINCE) # undef OPENSSL_SYS_UNIX # define OPENSSL_SYS_WINDOWS # ifndef OPENSSL_SYS_MSDOS |