summaryrefslogtreecommitdiffstats
path: root/thirdparty/openssl/crypto
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2017-05-27 16:38:46 +0200
committerRémi Verschelde <rverschelde@gmail.com>2017-05-27 19:08:03 +0200
commitc1b0662b40c8239731af13a96bac1b2db1c2097d (patch)
tree0f5b1e74fa201cf47990d72b22d4be114139db3e /thirdparty/openssl/crypto
parentcb0f771aaacf367e5026d783c9316b6acf3b007d (diff)
downloadredot-engine-c1b0662b40c8239731af13a96bac1b2db1c2097d.tar.gz
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).
Diffstat (limited to 'thirdparty/openssl/crypto')
-rw-r--r--thirdparty/openssl/crypto/o_str.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/thirdparty/openssl/crypto/o_str.c b/thirdparty/openssl/crypto/o_str.c
index 7e61cde85a..1854798e2c 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) && \