Skip to content

Commit bd0980f

Browse files
author
Felipe Zimmerle
committed
Reverts commit: a420214
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.
1 parent 93b12df commit bd0980f

File tree

2 files changed

+1
-4
lines changed

2 files changed

+1
-4
lines changed

apache2/msc_util.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -836,7 +836,7 @@ char *m_strcasestr(const char *haystack, const char *needle) {
836836
}
837837

838838
#ifdef WIN32
839-
int my_inet_pton(int family, const char *src, void *dst) {
839+
int inet_pton(int family, const char *src, void *dst) {
840840
struct addrinfo addr;
841841
struct sockaddr_in *in = NULL;
842842
#if APR_HAVE_IPV6

apache2/msc_util.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,6 @@ int DSOLOCAL inet_pton(int family, const char *src, void *dst);
5050
int DSOLOCAL swap_int32(int x);
5151
#endif
5252

53-
#ifdef WIN32
54-
#define inet_pton(x, y, z) my_inet_pton(x, y, z)
55-
#endif
5653

5754
char DSOLOCAL *utf8_unicode_inplace_ex(apr_pool_t *mp, unsigned char *input, long int input_len, int *changed);
5855

0 commit comments

Comments
 (0)