diff options
| author | Anatol Belski <ab@php.net> | 2017-11-30 12:40:52 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2017-11-30 12:40:52 +0100 |
| commit | 23d2bd374838897ec97f9994e70856686a89f132 (patch) | |
| tree | 340a70be0dfc6a0c468e87252c8b5973df82225f | |
| parent | 995ac8a09484b91aa9da6dc7387a6506e452fff2 (diff) | |
| download | php-git-23d2bd374838897ec97f9994e70856686a89f132.tar.gz | |
Fix macro redefinition warnings
The corresponding implementations are available from APR.
| -rw-r--r-- | Zend/zend_config.w32.h | 4 | ||||
| -rw-r--r-- | sapi/apache2handler/config.w32 | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/Zend/zend_config.w32.h b/Zend/zend_config.w32.h index 2ba42cdc9d..a1b3714979 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 8ea1305d4f..13f146fed8 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"); } |