From: Richard Levitte <levitte@openssl.org>
Date: Sun, 31 May 2015 15:47:31 +0000 (+0200)
Subject: Add the macro OPENSSL_SYS_WIN64
X-Git-Tag: OpenSSL_1_1_0-pre1~1044
X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=3f131556d6678bc3754f1e6d98a9a5bfc24e368c

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>
---

diff --git a/include/openssl/e_os2.h b/include/openssl/e_os2.h
index eef2a0b7a1..177b0981e3 100644
--- a/include/openssl/e_os2.h
+++ b/include/openssl/e_os2.h
@@ -104,6 +104,12 @@ extern "C" {
 #     define OPENSSL_SYS_WIN32
 #    endif
 #   endif
+#   if defined(_WIN64) || defined(OPENSSL_SYS_WIN64)
+#    undef OPENSSL_SYS_UNIX
+#    if !defined(OPENSSL_SYS_WIN64)
+#     define OPENSSL_SYS_WIN64
+#    endif
+#   endif
 #   if defined(OPENSSL_SYS_WINNT)
 #    undef OPENSSL_SYS_UNIX
 #   endif
@@ -114,7 +120,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