]> granicus.if.org Git - apache/commitdiff
Simplify. Checking for OPENSSL_NO_TLSEXT already
authorRainer Jung <rjung@apache.org>
Thu, 23 Apr 2015 07:33:34 +0000 (07:33 +0000)
committerRainer Jung <rjung@apache.org>
Thu, 23 Apr 2015 07:33:34 +0000 (07:33 +0000)
happens in a surrounding block.

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

modules/ssl/ssl_private.h

index 47a26715d3882ba3ca171fd722d6e97da91f833a..bbf8b4271554fd787b815a44ed4551c5e7ae5081 100644 (file)
 #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