diff options
| author | Anatol Belski <ab@php.net> | 2017-11-30 13:23:18 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2017-11-30 13:23:18 +0100 |
| commit | 821bdbdfba3d45066b45d506d62b4fb6ab44287b (patch) | |
| tree | 692b82aecc572b5a77d86cbb67aaa1a02d3a31b7 | |
| parent | 6d736aa400958413742a556dc0b973ad66392b8b (diff) | |
| parent | b6a27c73322adc269355fd7eacbefad074258a39 (diff) | |
| download | php-git-821bdbdfba3d45066b45d506d62b4fb6ab44287b.tar.gz | |
Merge branch 'PHP-7.2'
* PHP-7.2:
Revert "Fix macro redefinition warnings"
| -rw-r--r-- | Zend/zend_config.w32.h | 4 | ||||
| -rw-r--r-- | sapi/apache2handler/config.w32 | 1 |
2 files changed, 0 insertions, 5 deletions
diff --git a/Zend/zend_config.w32.h b/Zend/zend_config.w32.h index 8ca87f3c05..ddebdeaed8 100644 --- a/Zend/zend_config.w32.h +++ b/Zend/zend_config.w32.h @@ -50,12 +50,8 @@ 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 13f146fed8..8ea1305d4f 100644 --- a/sapi/apache2handler/config.w32 +++ b/sapi/apache2handler/config.w32 @@ -51,7 +51,6 @@ 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"); } |