summaryrefslogtreecommitdiff
path: root/OpenSSL/crypto/crypto.h
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSSL/crypto/crypto.h')
-rw-r--r--OpenSSL/crypto/crypto.h13
1 files changed, 13 insertions, 0 deletions
diff --git a/OpenSSL/crypto/crypto.h b/OpenSSL/crypto/crypto.h
index 35fbe74..4006e71 100644
--- a/OpenSSL/crypto/crypto.h
+++ b/OpenSSL/crypto/crypto.h
@@ -14,6 +14,19 @@
#define PyOpenSSL_CRYPTO_H_
#include <Python.h>
+/* Work around a bug in OpenSSL 1.0.0 which is caused by winsock.h being
+ included (from dtls1.h) too late by the OpenSSL header files, overriding
+ the fixes (in ossl_typ.h) for symbol clashes caused by this OS header
+ file.
+
+ In order to have those fixes still take effect, we include winsock.h
+ here, prior to including any OpenSSL header files.
+
+ */
+#ifdef _WIN32
+# include "winsock.h"
+#endif
+
#include "x509.h"
#include "x509name.h"
#include "netscape_spki.h"