archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Drop this VC8+ check, since our bare minimum of required VC version is higher anyway, meaning that CRT warnings are always supported.

Browse source
This commit is contained in:
Kalle Sommer Nielsen 2015-03-29 06:45:40 +02:00
parent ca0a2e7a3c
commit a75e8d1fe6
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
main/main.c
View file

@ -1974,7 +1974,7 @@ static int php_register_extensions_bc(zend_module_entry *ptr, int count)
} }
/* }}} */ /* }}} */
#if defined(PHP_WIN32) && _MSC_VER >= 1400 #ifdef PHP_WIN32
static _invalid_parameter_handler old_invalid_parameter_handler; static _invalid_parameter_handler old_invalid_parameter_handler;
void dummy_invalid_parameter_handler( void dummy_invalid_parameter_handler(
@ -2023,7 +2023,7 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod
#endif #endif
#ifdef PHP_WIN32 #ifdef PHP_WIN32
php_os = "WINNT"; php_os = "WINNT";
#if _MSC_VER >= 1400
old_invalid_parameter_handler = old_invalid_parameter_handler =
_set_invalid_parameter_handler(dummy_invalid_parameter_handler); _set_invalid_parameter_handler(dummy_invalid_parameter_handler);
if (old_invalid_parameter_handler != NULL) { if (old_invalid_parameter_handler != NULL) {
@ -2032,7 +2032,6 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod
/* Disable the message box for assertions.*/ /* Disable the message box for assertions.*/
_CrtSetReportMode(_CRT_ASSERT, 0); _CrtSetReportMode(_CRT_ASSERT, 0);
#endif
#else #else
php_os = PHP_OS; php_os = PHP_OS;
#endif #endif
@ -2412,7 +2411,7 @@ void php_module_shutdown(void)
ts_free_id(core_globals_id); ts_free_id(core_globals_id);
#endif #endif
#if defined(PHP_WIN32) && defined(_MSC_VER) && (_MSC_VER >= 1400) #ifdef PHP_WIN32
if (old_invalid_parameter_handler == NULL) { if (old_invalid_parameter_handler == NULL) {
_set_invalid_parameter_handler(old_invalid_parameter_handler); _set_invalid_parameter_handler(old_invalid_parameter_handler);
} }