diff options
| author | Kalle Sommer Nielsen <kalle@php.net> | 2015-03-29 06:45:40 +0200 |
|---|---|---|
| committer | Kalle Sommer Nielsen <kalle@php.net> | 2015-03-29 06:45:40 +0200 |
| commit | a75e8d1fe6e43571b2add5da5db9eed02c69a8fc (patch) | |
| tree | 433514a34c5e9aa2bc816b5c37f8fdfb04b0268f | |
| parent | ca0a2e7a3cb202864c8a57a061d3dee567a7703b (diff) | |
| download | php-git-a75e8d1fe6e43571b2add5da5db9eed02c69a8fc.tar.gz | |
Drop this VC8+ check, since our bare minimum of required VC version is higher anyway, meaning that CRT warnings are always supported.
| -rw-r--r-- | main/main.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/main/main.c b/main/main.c index 2a808dd7c5..a7f3bad31e 100644 --- a/main/main.c +++ b/main/main.c @@ -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; void dummy_invalid_parameter_handler( @@ -2023,7 +2023,7 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod #endif #ifdef PHP_WIN32 php_os = "WINNT"; -#if _MSC_VER >= 1400 + old_invalid_parameter_handler = _set_invalid_parameter_handler(dummy_invalid_parameter_handler); 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.*/ _CrtSetReportMode(_CRT_ASSERT, 0); -#endif #else php_os = PHP_OS; #endif @@ -2412,7 +2411,7 @@ void php_module_shutdown(void) ts_free_id(core_globals_id); #endif -#if defined(PHP_WIN32) && defined(_MSC_VER) && (_MSC_VER >= 1400) +#ifdef PHP_WIN32 if (old_invalid_parameter_handler == NULL) { _set_invalid_parameter_handler(old_invalid_parameter_handler); } |