diff options
| author | wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68> | 2008-06-11 04:54:32 +0000 |
|---|---|---|
| committer | wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68> | 2008-06-11 04:54:32 +0000 |
| commit | ce1143140246edc785cd5dc02cf239d569470297 (patch) | |
| tree | b682116e9d63cbbc690593367d6d134db971935d /include/apr.hw | |
| parent | ce478fe1d5317341b59ac43f749ec1a8e09c2a6d (diff) | |
| download | libapr-ce1143140246edc785cd5dc02cf239d569470297.tar.gz | |
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
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@666521 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'include/apr.hw')
| -rw-r--r-- | include/apr.hw | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/apr.hw b/include/apr.hw index d4c15f0cc..a2bd54f1e 100644 --- a/include/apr.hw +++ b/include/apr.hw @@ -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 @@ extern "C" { #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 @@ typedef int gid_t; #define STDERR_FILENO 2 #if APR_HAVE_IPV6 +#include <ws2tcpip.h> /* Appears in later flavors, not the originals. */ #ifndef in_addr6 |