curl: merge patch from @bagder to fix the build with libressl.

This commit is contained in:
Juan RP 2016-03-23 10:09:25 +01:00
parent e9022e4ed9
commit 729e1557a0

View file

@ -0,0 +1,13 @@
--- lib/vtls/openssl.c
+++ lib/vtls/openssl.c
@@ -95,7 +95,9 @@
#if (OPENSSL_VERSION_NUMBER >= 0x10000000L)
#define HAVE_ERR_REMOVE_THREAD_STATE 1
-#if (OPENSSL_VERSION_NUMBER >= 0x10100004L)
+#if (OPENSSL_VERSION_NUMBER >= 0x10100004L) && \
+ !defined(LIBRESSL_VERSION_NUMBER) && \
+ !defined(OPENSSL_IS_BORINGSSL)
/* OpenSSL 1.1.0-pre4 removed the argument! */
#define HAVE_ERR_REMOVE_THREAD_STATE_NOARG 1
#endif