Fix macro redefinition warnings

The corresponding implementations are available from APR.

diff --git a/Zend/zend_config.w32.h b/Zend/zend_config.w32.h
index 2ba42cdc9d7bc3afbbb525f9e00d35bc71def5d4..a1b3714979de386d89fce158f7daca0222745b27 100644 (file)
--- a/Zend/zend_config.w32.h
+++ b/Zend/zend_config.w32.h
@@ -50,8 +50,12 @@ typedef unsigned int uint;
 #if _MSC_VER < 1900
 #define snprintf _snprintf
 #endif
+#ifndef HAVE_STRCASECMP
 #define strcasecmp(s1, s2) _stricmp(s1, s2)
+#endif
+#ifndef HAVE_STRNCASECMP
 #define strncasecmp(s1, s2, n) _strnicmp(s1, s2, n)
+#endif
 #define zend_isinf(a)  ((_fpclass(a) == _FPCLASS_PINF) || (_fpclass(a) == _FPCLASS_NINF))
 #define zend_finite(x) _finite(x)
 #define zend_isnan(x)  _isnan(x)

diff --git a/sapi/apache2handler/config.w32 b/sapi/apache2handler/config.w32
index 8ea1305d4fca94682aabe75d2b10d5418cfa3740..13f146fed86008ec3c7f4fd0e4880e6b1a2ae7c5 100644 (file)
--- a/sapi/apache2handler/config.w32
+++ b/sapi/apache2handler/config.w32
@@ -51,6 +51,7 @@ if (PHP_APACHE2_4HANDLER != "no") {
                                'php' + PHP_VERSION + 'apache2_4.dll',
                                '/D PHP_APACHE2_EXPORTS /I win32 /DZEND_ENABLE_STATIC_TSRMLS_CACHE=1',
                                'sapi\\apache2handler');
+               ADD_FLAG("CFLAGS_APACHE2_4HANDLER", "/D HAVE_STRCASECMP=1 /D HAVE_STRNCASECMP=1");
        } else {
                WARNING("Could not find apache 2.4 libraries/headers");
        }