Merge branch 'PHP-7.2'

* PHP-7.2: Fix macro redefinition warnings
kea · Nov 30, 2017 · a415006 · a415006
2 parents 7067f7c + 23d2bd3
commit a415006
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git 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
@@ -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");
 	}