From bd0980f63d46d59166f56cdb7da9fecaaeeb2872 Mon Sep 17 00:00:00 2001 From: Felipe Zimmerle Date: Thu, 19 Dec 2013 12:13:25 -0800 Subject: [PATCH] Reverts commit: a4202146b8d26b6615bbab986383fe0afae60d77 Testing inet_pton with the help of Steffen. Acording to Steffen we can use !(NTDDI_VERSION >= NTDDI_VISTA) to identify that the specific Windows version has this function defined or not, if so we can use the Windows version. Reverting this commit to avoid to overwrite the Windows' function. And see the original error that happened before this commit. --- apache2/msc_util.c | 2 +- apache2/msc_util.h | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/apache2/msc_util.c b/apache2/msc_util.c index 8b3fc43c..bb9b4e78 100644 --- a/apache2/msc_util.c +++ b/apache2/msc_util.c @@ -836,7 +836,7 @@ char *m_strcasestr(const char *haystack, const char *needle) { } #ifdef WIN32 -int my_inet_pton(int family, const char *src, void *dst) { +int inet_pton(int family, const char *src, void *dst) { struct addrinfo addr; struct sockaddr_in *in = NULL; #if APR_HAVE_IPV6 diff --git a/apache2/msc_util.h b/apache2/msc_util.h index 9ce41f6e..d5f19151 100644 --- a/apache2/msc_util.h +++ b/apache2/msc_util.h @@ -50,9 +50,6 @@ int DSOLOCAL inet_pton(int family, const char *src, void *dst); int DSOLOCAL swap_int32(int x); #endif -#ifdef WIN32 -#define inet_pton(x, y, z) my_inet_pton(x, y, z) -#endif char DSOLOCAL *utf8_unicode_inplace_ex(apr_pool_t *mp, unsigned char *input, long int input_len, int *changed);