From: Rainer Jung <rjung@apache.org>
Date: Thu, 23 Apr 2015 07:33:34 +0000 (+0000)
Subject: Simplify. Checking for OPENSSL_NO_TLSEXT already
X-Git-Tag: 2.5.0-alpha~3221
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=970818995c52e2d4ebf8b5dc422ad1e0fafbde15;p=apache

Simplify. Checking for OPENSSL_NO_TLSEXT already
happens in a surrounding block.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1675549 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/ssl/ssl_private.h b/modules/ssl/ssl_private.h
index 47a26715d3..bbf8b42715 100644
--- a/modules/ssl/ssl_private.h
+++ b/modules/ssl/ssl_private.h
@@ -177,12 +177,12 @@
 #endif
 
 /* ALPN Protocol Negotiation */
-#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(OPENSSL_NO_TLSEXT)
+#if OPENSSL_VERSION_NUMBER >= 0x10002000L
 #define HAVE_TLS_ALPN
 #endif
 
 /* Next Protocol Negotiation */
-#if !defined(OPENSSL_NO_NEXTPROTONEG) && !defined(OPENSSL_NO_TLSEXT) && defined(OPENSSL_NPN_NEGOTIATED)
+#if !defined(OPENSSL_NO_NEXTPROTONEG) && defined(OPENSSL_NPN_NEGOTIATED)
 #define HAVE_TLS_NPN
 #endif