Second part of IIS/nginx merge into M2 trunk.

This commit is contained in:
gregwroblewski
2012-08-20 20:31:06 +00:00
parent f3e31c75a4
commit 2dbe4ab4f0
23 changed files with 4780 additions and 43 deletions

View File

@@ -30,8 +30,15 @@
#ifdef WIN32
#include <ws2tcpip.h>
// This is a trick: for ModSecurity modules this will declare inet_pton,
// but for mymodule.cpp (IIS module) this will skip, because we include
// windows.h before including msc_util.h
// Without the trick we have redefinition conflict.
//
#if !(NTDDI_VERSION >= NTDDI_VISTA)
int DSOLOCAL inet_pton(int family, const char *src, void *dst);
#endif
#endif
char DSOLOCAL *m_strcasestr(const char *haystack, const char *needle);