diff options
| author | George Marques | 2016-07-09 20:02:26 -0300 |
|---|---|---|
| committer | Rémi Verschelde | 2016-07-10 10:30:17 +0200 |
| commit | 78883ea57db418857c6ad026d767ccdb86205e40 (patch) | |
| tree | f9e310212fbef87262eab5b439952388a240608b | |
| parent | 9cc9b45948432e9b74c4152bf90b7843dc6b26e0 (diff) | |
| download | godot-78883ea57db418857c6ad026d767ccdb86205e40.tar.gz godot-78883ea57db418857c6ad026d767ccdb86205e40.tar.zst godot-78883ea57db418857c6ad026d767ccdb86205e40.zip | |
Fix builtin OpenSSL configuration
Fixes a bug that happens on Windows 64-bits.
(cherry picked from commit 2c6d0d490519016986c1c5be992ff53fbdea8c8f)
| -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 25429e94d..c86bb60b9 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 |