Return-Path: X-Original-To: apmail-httpd-cvs-archive@www.apache.org Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9938918352 for ; Thu, 23 Apr 2015 07:33:35 +0000 (UTC) Received: (qmail 48217 invoked by uid 500); 23 Apr 2015 07:33:35 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 48154 invoked by uid 500); 23 Apr 2015 07:33:35 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 48143 invoked by uid 99); 23 Apr 2015 07:33:35 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 23 Apr 2015 07:33:35 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id 09363AC006A for ; Thu, 23 Apr 2015 07:33:35 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1675549 - /httpd/httpd/trunk/modules/ssl/ssl_private.h Date: Thu, 23 Apr 2015 07:33:34 -0000 To: cvs@httpd.apache.org From: rjung@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150423073335.09363AC006A@hades.apache.org> Author: rjung Date: Thu Apr 23 07:33:34 2015 New Revision: 1675549 URL: http://svn.apache.org/r1675549 Log: Simplify. Checking for OPENSSL_NO_TLSEXT already happens in a surrounding block. Modified: httpd/httpd/trunk/modules/ssl/ssl_private.h Modified: httpd/httpd/trunk/modules/ssl/ssl_private.h URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_private.h?rev=1675549&r1=1675548&r2=1675549&view=diff ============================================================================== --- httpd/httpd/trunk/modules/ssl/ssl_private.h (original) +++ httpd/httpd/trunk/modules/ssl/ssl_private.h Thu Apr 23 07:33:34 2015 @@ -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