Skip to content

Commit 23d2bd3

Browse files
committed
Fix macro redefinition warnings
The corresponding implementations are available from APR.
1 parent 995ac8a commit 23d2bd3

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

Zend/zend_config.w32.h

+4
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,12 @@ typedef unsigned int uint;
5050
#if _MSC_VER < 1900
5151
#define snprintf _snprintf
5252
#endif
53+
#ifndef HAVE_STRCASECMP
5354
#define strcasecmp(s1, s2) _stricmp(s1, s2)
55+
#endif
56+
#ifndef HAVE_STRNCASECMP
5457
#define strncasecmp(s1, s2, n) _strnicmp(s1, s2, n)
58+
#endif
5559
#define zend_isinf(a) ((_fpclass(a) == _FPCLASS_PINF) || (_fpclass(a) == _FPCLASS_NINF))
5660
#define zend_finite(x) _finite(x)
5761
#define zend_isnan(x) _isnan(x)

sapi/apache2handler/config.w32

+1
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ if (PHP_APACHE2_4HANDLER != "no") {
5151
'php' + PHP_VERSION + 'apache2_4.dll',
5252
'/D PHP_APACHE2_EXPORTS /I win32 /DZEND_ENABLE_STATIC_TSRMLS_CACHE=1',
5353
'sapi\\apache2handler');
54+
ADD_FLAG("CFLAGS_APACHE2_4HANDLER", "/D HAVE_STRCASECMP=1 /D HAVE_STRNCASECMP=1");
5455
} else {
5556
WARNING("Could not find apache 2.4 libraries/headers");
5657
}

0 commit comments

Comments
 (0)