Merge heads

fb0c640f · Serhiy Storchaka · cefbe249 · 9257eef1 · fb0c640f
Commit fb0c640f authored Jan 27, 2015 by Serhiy Storchaka
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

Modules/_ssl.c Modules/_ssl.c +1 -1

No files found.
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -106,7 +106,7 @@ struct py_ssl_library_code {
 #endif
 /* ALPN added in OpenSSL 1.0.2 */
-#if OPENSSL_VERSION_NUMBER >= 0x1000200fL && !defined(OPENSSL_NO_TLSEXT)
+#if !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x1000200fL && !defined(OPENSSL_NO_TLSEXT)
 # define HAVE_ALPN
 #endif