diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-07-10 09:50:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-10 09:50:49 +0200 |
| commit | ae3d316798b6fbb36f73e7c2c0724dfac4f7ecad (patch) | |
| tree | ed28a87d9d27eaa976757f78a2c5c4e110bd9776 | |
| parent | 864c0e84de9c2a2c5a030ec4ee167f3793e1e962 (diff) | |
| parent | 2c6d0d490519016986c1c5be992ff53fbdea8c8f (diff) | |
Merge pull request #5618 from vnen/fix-openssl-conf
Fix builtin OpenSSL configuration
| -rw-r--r-- | drivers/builtin_openssl2/openssl/opensslconf.h | 9 |
1 files 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 |