From commits-return-9721-apmail-apr-commits-archive=apr.apache.org@apr.apache.org Wed Jun 11 04:55:47 2008 Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 50965 invoked from network); 11 Jun 2008 04:55:47 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 11 Jun 2008 04:55:47 -0000 Received: (qmail 17616 invoked by uid 500); 11 Jun 2008 04:55:49 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 17570 invoked by uid 500); 11 Jun 2008 04:55:49 -0000 Mailing-List: contact commits-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: Reply-To: dev@apr.apache.org List-Id: Delivered-To: mailing list commits@apr.apache.org Received: (qmail 17561 invoked by uid 99); 11 Jun 2008 04:55:49 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 10 Jun 2008 21:55:49 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Jun 2008 04:55:08 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 640EE23889F7; Tue, 10 Jun 2008 21:55:26 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r666522 - /apr/apr/branches/1.3.x/include/apr.hw Date: Wed, 11 Jun 2008 04:55:26 -0000 To: commits@apr.apache.org From: wrowe@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080611045526.640EE23889F7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: wrowe Date: Tue Jun 10 21:55:26 2008 New Revision: 666522 URL: http://svn.apache.org/viewvc?rev=666522&view=rev Log: Revert 1.3.0 change which mis-organized the ws2tcpip header test prior to declaring APR_HAVE_IPV6, and inadvertantly changed the default of APR_HAVE_IPV6 to 1 Modified: apr/apr/branches/1.3.x/include/apr.hw Modified: apr/apr/branches/1.3.x/include/apr.hw URL: http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/include/apr.hw?rev=666522&r1=666521&r2=666522&view=diff ============================================================================== --- apr/apr/branches/1.3.x/include/apr.hw (original) +++ apr/apr/branches/1.3.x/include/apr.hw Tue Jun 10 21:55:26 2008 @@ -229,9 +229,6 @@ #if APR_HAVE_PROCESS_H #include #endif -#if APR_HAVE_IPV6 -#include -#endif #ifdef __cplusplus extern "C" { @@ -280,7 +277,7 @@ #define APR_HAVE_IN_ADDR 1 #define APR_HAVE_INET_ADDR 1 #define APR_HAVE_INET_NETWORK 0 -#define APR_HAVE_IPV6 1 +#define APR_HAVE_IPV6 0 #define APR_HAVE_MEMMOVE 1 #define APR_HAVE_SETRLIMIT 0 #define APR_HAVE_SIGACTION 0 @@ -611,6 +608,7 @@ #define STDERR_FILENO 2 #if APR_HAVE_IPV6 +#include /* Appears in later flavors, not the originals. */ #ifndef in_addr6