com php-src: Fix macro redefinition warnings: Zend/zend_confi g.w32.h sapi/apache2handler/config.w32

Commit: 23d2bd374838897ec97f9994e70856686a89f132 Author: Anatol Belski <ab@php.net> Thu, 30 Nov 2017 12:40:52 +0100 Parents: 995ac8a09484b91aa9da6dc7387a6506e452fff2 Branches: PHP-7.2 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=23d2bd374838897ec97f9994e70856686a89f132 Log: Fix macro redefinition warnings The corresponding implementations are available from APR. Changed paths: M Zend/zend_config.w32.h M sapi/apache2handler/config.w32 Diff: diff --git a/Zend/zend_config.w32.h b/Zend/zend_config.w32..h index 2ba42cd..a1b3714 100644 --- 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 8ea1305..13f146f 100644 --- 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"); }