[openssl-commits] [openssl] OpenSSL_1_0_1-stable update

[Richard Levitte]

The branch OpenSSL_1_0_1-stable has been updated
       via  1977240204fbb85087d15a75c4a2169820eff787 (commit)
      from  939b4960276b040fc0ed52232238fcc9e2e9ec21 (commit)


- Log -----------------------------------------------------------------
commit 1977240204fbb85087d15a75c4a2169820eff787
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>
    (cherry picked from commit 3f131556d6678bc3754f1e6d98a9a5bfc24e368c)
    
    Conflicts:
    	e_os2.h

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

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

diff --git a/e_os2.h b/e_os2.h
index d400ac7..2b1b78f 100644
--- a/e_os2.h
+++ b/e_os2.h
@@ -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