summaryrefslogtreecommitdiff
path: root/deps
diff options
context:
space:
mode:
authorBert Belder <bertbelder@gmail.com>2014-12-09 15:46:59 +0100
committerBert Belder <bertbelder@gmail.com>2014-12-09 15:46:59 +0100
commit878cc3e532ec5feb7145ba0523db2c6383df748b (patch)
tree1bc4b638bb2f4bb4c02a795d5a19000fdd6722ce /deps
parentdd7ce6909709044d61e554727b80442047e01241 (diff)
downloadandroid-node-v8-878cc3e532ec5feb7145ba0523db2c6383df748b.tar.gz
android-node-v8-878cc3e532ec5feb7145ba0523db2c6383df748b.tar.bz2
android-node-v8-878cc3e532ec5feb7145ba0523db2c6383df748b.zip
openssl: don't define SIXTY_FOUR_BIT_LONG on Windows
On Windows (and potentially other LP64 platforms), a long integer is always 32-bits, even when the target architecture uses 64-bit pointers. Signed-off-by: Bert Belder <bertbelder@gmail.com>
Diffstat (limited to 'deps')
-rw-r--r--deps/openssl/config/opensslconf.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/deps/openssl/config/opensslconf.h b/deps/openssl/config/opensslconf.h
index 37e5c4f54a..fb4c6c5710 100644
--- a/deps/openssl/config/opensslconf.h
+++ b/deps/openssl/config/opensslconf.h
@@ -221,7 +221,7 @@
# undef SIXTEEN_BIT
# undef EIGHT_BIT
# if defined(_M_X64) || defined(__x86_64__)
-# if defined(_WIN64) || defined(_LP64)
+# if !defined(_WIN32) && !defined(_LP64)
# define SIXTY_FOUR_BIT_LONG
# else
# define SIXTY_FOUR_BIT