@@ -, +, @@ 
    openssl: fix ERR_remove_thread_state() for boringssl/libressl
    
    The removed arg is only done in OpenSSL
    
    Bug: https://twitter.com/xtraemeat/status/712564874098917376
--- a/lib/vtls/openssl.c	
+++ a/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