archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.2'

Browse source 
* PHP-7.2:
  Revert "Fix macro redefinition warnings"
This commit is contained in:
Anatol Belski 2017-11-30 13:23:18 +01:00
commit 821bdbdfba
2 changed files with 0 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Zend/zend_config.w32.h
View file

@ -50,12 +50,8 @@ typedef unsigned int uint;
#if _MSC_VER < 1900 #if _MSC_VER < 1900
#define snprintf _snprintf #define snprintf _snprintf
#endif #endif
#ifndef HAVE_STRCASECMP
#define strcasecmp(s1, s2) _stricmp(s1, s2) #define strcasecmp(s1, s2) _stricmp(s1, s2)
#endif
#ifndef HAVE_STRNCASECMP
#define strncasecmp(s1, s2, n) _strnicmp(s1, s2, n) #define strncasecmp(s1, s2, n) _strnicmp(s1, s2, n)
#endif
#define zend_isinf(a) ((_fpclass(a) == _FPCLASS_PINF) || (_fpclass(a) == _FPCLASS_NINF)) #define zend_isinf(a) ((_fpclass(a) == _FPCLASS_PINF) || (_fpclass(a) == _FPCLASS_NINF))
#define zend_finite(x) _finite(x) #define zend_finite(x) _finite(x)
#define zend_isnan(x) _isnan(x) #define zend_isnan(x) _isnan(x)

1
sapi/apache2handler/config.w32
View file

@ -51,7 +51,6 @@ if (PHP_APACHE2_4HANDLER != "no") {
'php' + PHP_VERSION + 'apache2_4.dll', 'php' + PHP_VERSION + 'apache2_4.dll',
'/D PHP_APACHE2_EXPORTS /I win32 /DZEND_ENABLE_STATIC_TSRMLS_CACHE=1', '/D PHP_APACHE2_EXPORTS /I win32 /DZEND_ENABLE_STATIC_TSRMLS_CACHE=1',
'sapi\\apache2handler'); 'sapi\\apache2handler');
ADD_FLAG("CFLAGS_APACHE2_4HANDLER", "/D HAVE_STRCASECMP=1 /D HAVE_STRNCASECMP=1");
} else { } else {
WARNING("Could not find apache 2.4 libraries/headers"); WARNING("Could not find apache 2.4 libraries/headers");
} }