aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2015-05-31 17:47:31 +0200
committerRichard Levitte <levitte@openssl.org>2015-06-02 17:56:48 +0200
commit3f131556d6678bc3754f1e6d98a9a5bfc24e368c (patch)
treef3cf43c1fae663aaeffdaaa376d9c712058a7335 /include
parent45d051c82563a75b07ec54b63e3a5bbad388ab67 (diff)
downloadopenssl-3f131556d6678bc3754f1e6d98a9a5bfc24e368c.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>
Diffstat (limited to 'include')
-rw-r--r--include/openssl/e_os2.h8
1 files changed, 7 insertions, 1 deletions
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