aboutsummaryrefslogtreecommitdiff
path: root/openssl/e_os2.h
diff options
context:
space:
mode:
authorMike DePaulo <mikedep333@gmail.com>2015-07-07 08:57:00 -0400
committerMike DePaulo <mikedep333@gmail.com>2015-07-07 08:57:00 -0400
commitddb34d947fe45fcc4d2a8da284e7fa0c001bb7d3 (patch)
treeca8fc6529b2ff894f5264dbce5b53d3e595ee1c9 /openssl/e_os2.h
parentbbc50e3219a2e7801f4e636fe90df08fe3a28323 (diff)
downloadvcxsrv-ddb34d947fe45fcc4d2a8da284e7fa0c001bb7d3.tar.gz
vcxsrv-ddb34d947fe45fcc4d2a8da284e7fa0c001bb7d3.tar.bz2
vcxsrv-ddb34d947fe45fcc4d2a8da284e7fa0c001bb7d3.zip
Update openssl: 1.0.1m -> 1.0.1o
Diffstat (limited to 'openssl/e_os2.h')
-rw-r--r--openssl/e_os2.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/openssl/e_os2.h b/openssl/e_os2.h
index d400ac77c..2b1b78ffe 100644
--- a/openssl/e_os2.h
+++ b/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