github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-08-14 13:56:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Reverts commit: a4202146b8d26b6615bbab986383fe0afae60d77

Browse Source 
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.
This commit is contained in:
Felipe Zimmerle 2013-12-19 12:13:25 -08:00
parent 93b12df721
commit bd0980f63d
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apache2/msc_util.c
View File

@ -836,7 +836,7 @@ char *m_strcasestr(const char *haystack, const char *needle) {
} }
#ifdef WIN32 #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 addrinfo addr;
struct sockaddr_in *in = NULL; struct sockaddr_in *in = NULL;
#if APR_HAVE_IPV6 #if APR_HAVE_IPV6

3
apache2/msc_util.h
View File

@ -50,9 +50,6 @@ int DSOLOCAL inet_pton(int family, const char *src, void *dst);
int DSOLOCAL swap_int32(int x); int DSOLOCAL swap_int32(int x);
#endif #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); char DSOLOCAL *utf8_unicode_inplace_ex(apr_pool_t *mp, unsigned char *input, long int input_len, int *changed);