You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by wr...@apache.org on 2008/06/11 06:55:26 UTC
svn commit: r666522 - /apr/apr/branches/1.3.x/include/apr.hw
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 <process.h>
#endif
-#if APR_HAVE_IPV6
-#include <ws2tcpip.h>
-#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 <ws2tcpip.h>
/* Appears in later flavors, not the originals. */
#ifndef in_addr6