diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-02-14 08:00:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-14 08:00:47 +0100 |
| commit | ac5cce5e9513eba34745f7e1e90c320ec92390f9 (patch) | |
| tree | 0ccca56f5fbc3fde1bc00ee72e272b842329c62f /thirdparty/openssl/patches/config_windows.patch | |
| parent | e7351ecdf5f14f1b6a8733f91fd90646406d77a5 (diff) | |
| parent | bd3c27ba7862d50b1bf54733e9f890f7084a9ea5 (diff) | |
Merge pull request #16519 from Faless/mbedtls
Replace OpenSSL with mbedTLS
Diffstat (limited to 'thirdparty/openssl/patches/config_windows.patch')
| -rw-r--r-- | thirdparty/openssl/patches/config_windows.patch | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/thirdparty/openssl/patches/config_windows.patch b/thirdparty/openssl/patches/config_windows.patch deleted file mode 100644 index e69ff1356a..0000000000 --- a/thirdparty/openssl/patches/config_windows.patch +++ /dev/null @@ -1,49 +0,0 @@ -commit 4c8ab8b4415d129d0283d7d0d9a5789163ec8d5e -Author: Rémi Verschelde <rverschelde@gmail.com> -Date: Sat May 27 16:38:46 2017 +0200 - - openssl: Define WIN32_LEAN_AND_MEAN on Windows - - This avoids namespace collisions with things such as X509_NAME. - Also force include of necessary definitions in `crypto/o_str.c` - which seem missing on MSVC (but work on MinGW). - -diff --git a/thirdparty/openssl/crypto/o_str.c b/thirdparty/openssl/crypto/o_str.c -index 7e61cde85..1854798e2 100644 ---- a/thirdparty/openssl/crypto/o_str.c -+++ b/thirdparty/openssl/crypto/o_str.c -@@ -59,6 +59,9 @@ - - #include <ctype.h> - #include <e_os.h> -+// -- GODOT start -- -+#include <openssl/opensslconf.h> -+// -- GODOT end -- - #include "o_str.h" - - #if !defined(OPENSSL_IMPLEMENTS_strncasecmp) && \ -diff --git a/thirdparty/openssl/openssl/opensslconf.h b/thirdparty/openssl/openssl/opensslconf.h -index f533508b1..19fad2342 100644 ---- a/thirdparty/openssl/openssl/opensslconf.h -+++ b/thirdparty/openssl/openssl/opensslconf.h -@@ -7,6 +7,20 @@ extern "C" { - /* OpenSSL was configured with the following options: */ - #ifndef OPENSSL_DOING_MAKEDEPEND - -+// -- GODOT start -- -+#if defined(OPENSSL_SYS_WINDOWS) -+# define WIN32_LEAN_AND_MEAN -+// Seems like we have troubles properly using the logic in e_os2.h -+# if defined(_WIN32) -+# define OPENSSL_SYS_WIN32 -+# define OPENSSL_SYSNAME_WIN32 -+# endif -+# if defined(_WIN64) -+# define OPENSSL_SYS_WIN64 -+# define OPENSSL_SYSNAME_WIN64 -+# endif -+#endif -+// -- GODOT end -- - - #ifndef OPENSSL_NO_EC_NISTP_64_GCC_128 - # define OPENSSL_NO_EC_NISTP_64_GCC_128 |