From: Anatol Belski <ab@php.net>
Date: Thu, 30 Nov 2017 12:21:04 +0000 (+0100)
Subject: Revert "Fix macro redefinition warnings"
X-Git-Tag: php-7.2.1RC1~20
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b6a27c73322adc269355fd7eacbefad074258a39;p=php

Revert "Fix macro redefinition warnings"

This reverts commit 23d2bd374838897ec97f9994e70856686a89f132.
---

diff --git a/Zend/zend_config.w32.h b/Zend/zend_config.w32.h
index a1b3714979..2ba42cdc9d 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");
 	}