diff options
author | dnobori <da.git@softether.co.jp> | 2016-11-27 11:43:14 +0300 |
---|---|---|
committer | dnobori <da.git@softether.co.jp> | 2016-11-27 11:43:14 +0300 |
commit | 4df2eb4f9c2a8cf50e0123496bc20470edc21dc4 (patch) | |
tree | c31ceaa1709f599be25917bd35ae67f489d13652 /src/Mayaqua/win32_inc/openssl/e_os2.h | |
parent | 0978e1a016e8de556514e51ffe1d7aa553562f19 (diff) |
v4.22-9634-betav4.22-9634-beta
Diffstat (limited to 'src/Mayaqua/win32_inc/openssl/e_os2.h')
-rw-r--r-- | src/Mayaqua/win32_inc/openssl/e_os2.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/Mayaqua/win32_inc/openssl/e_os2.h b/src/Mayaqua/win32_inc/openssl/e_os2.h index 1d990ea7..a07067b7 100644 --- a/src/Mayaqua/win32_inc/openssl/e_os2.h +++ b/src/Mayaqua/win32_inc/openssl/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
@@ -325,4 +331,3 @@ extern "C" { #undef OPENSSL_SYS_WIN32
#undef OPENSSL_SYS_WINDOWS
#endif // _MSC_VER
-
|