diff options
| author | Juan Linietsky | 2014-09-17 09:53:17 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2014-09-17 09:53:17 -0300 |
| commit | 431c0c69037c4c0b27777d7cf43f938ad7c8c681 (patch) | |
| tree | 5e661b18d3b428555c05ec0f95b01849633a280c /drivers/builtin_openssl2 | |
| parent | 326fd93e1df55f8fb0bc01dceca55ce28f6488ad (diff) | |
| parent | d98d3fb8ea617eadc5f8e268b9f26f8e586e118c (diff) | |
| download | godot-431c0c69037c4c0b27777d7cf43f938ad7c8c681.tar.gz godot-431c0c69037c4c0b27777d7cf43f938ad7c8c681.tar.zst godot-431c0c69037c4c0b27777d7cf43f938ad7c8c681.zip | |
Merge pull request #658 from TheoXD/_windows_openssl2_fix
Someone fixed compiling issue on Win
Diffstat (limited to 'drivers/builtin_openssl2')
| -rw-r--r-- | drivers/builtin_openssl2/crypto/o_str.c | 6 | ||||
| -rw-r--r-- | drivers/builtin_openssl2/openssl/rand.h | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/drivers/builtin_openssl2/crypto/o_str.c b/drivers/builtin_openssl2/crypto/o_str.c index 56104a6c3..d233afd46 100644 --- a/drivers/builtin_openssl2/crypto/o_str.c +++ b/drivers/builtin_openssl2/crypto/o_str.c @@ -63,7 +63,11 @@ #if !defined(OPENSSL_IMPLEMENTS_strncasecmp) && \ !defined(OPENSSL_SYSNAME_WIN32) && \ !defined(NETWARE_CLIB) -# include <strings.h> +#ifdef _WIN32 +#include <string.h> +#else +#include <strings.h> +#endif #endif int OPENSSL_strncasecmp(const char *str1, const char *str2, size_t n) diff --git a/drivers/builtin_openssl2/openssl/rand.h b/drivers/builtin_openssl2/openssl/rand.h index 290f069f4..b5adb825f 100644 --- a/drivers/builtin_openssl2/openssl/rand.h +++ b/drivers/builtin_openssl2/openssl/rand.h @@ -64,6 +64,7 @@ #include <openssl/e_os2.h> #if defined(OPENSSL_SYS_WINDOWS) +#define WIN32_LEAN_AND_MEAN #include <windows.h> #ifdef OCSP_RESPONSE #undef OCSP_RESPONSE |