[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  3f131556d6678bc3754f1e6d98a9a5bfc24e368c (commit)
      from  45d051c82563a75b07ec54b63e3a5bbad388ab67 (commit)


- Log -----------------------------------------------------------------
commit 3f131556d6678bc3754f1e6d98a9a5bfc24e368c
Author: Richard Levitte <levitte at openssl.org>
Date:   Sun May 31 17:47:31 2015 +0200

    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 at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 include/openssl/e_os2.h | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/include/openssl/e_os2.h b/include/openssl/e_os2.h
index eef2a0b..177b098 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