From: Rainer Jung <rjung@apache.org>
Date: Wed, 22 Apr 2015 19:29:07 +0000 (+0000)
Subject: HAVE_TLS_NPN was defined twice in this file.
X-Git-Tag: 2.5.0-alpha~3229
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=77a253bf3e0f01a2ea99b550c61f0fa4b31d6526;p=apache

HAVE_TLS_NPN was defined twice in this file.


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

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