From 78883ea57db418857c6ad026d767ccdb86205e40 Mon Sep 17 00:00:00 2001 From: George Marques Date: Sat, 9 Jul 2016 20:02:26 -0300 Subject: [PATCH] Fix builtin OpenSSL configuration Fixes a bug that happens on Windows 64-bits. (cherry picked from commit 2c6d0d490519016986c1c5be992ff53fbdea8c8f) --- drivers/builtin_openssl2/openssl/opensslconf.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/builtin_openssl2/openssl/opensslconf.h b/drivers/builtin_openssl2/openssl/opensslconf.h index 25429e94d6..c86bb60b94 100644 --- a/drivers/builtin_openssl2/openssl/opensslconf.h +++ b/drivers/builtin_openssl2/openssl/opensslconf.h @@ -213,8 +213,13 @@ extern "C" { #ifdef OPENSSL_USE_64_BITS -#define SIXTY_FOUR_BIT_LONG -#undef SIXTY_FOUR_BIT +# ifdef _WIN32 +# undef SIXTY_FOUR_BIT_LONG +# define SIXTY_FOUR_BIT +# else +# define SIXTY_FOUR_BIT_LONG +# undef SIXTY_FOUR_BIT +# endif #undef THIRTY_TWO_BIT #else