diff options
| author | Kalle Sommer Nielsen <kalle@php.net> | 2010-04-13 11:14:04 +0000 |
|---|---|---|
| committer | Kalle Sommer Nielsen <kalle@php.net> | 2010-04-13 11:14:04 +0000 |
| commit | ec5ece6caf45ac92262713c99422f257740fbd37 (patch) | |
| tree | e3c1d7c74dcfae1e21eb2403bf0d4b7d9ec24936 | |
| parent | 7ef4cdf47103c0eb348b351ba5da7c1cfc93dd58 (diff) | |
| download | php-git-ec5ece6caf45ac92262713c99422f257740fbd37.tar.gz | |
PHP_OS is now always WINNT on Windows, since we don't support anything prior to XP SP2
| -rw-r--r-- | main/main.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/main/main.c b/main/main.c index 9827c23d1f..b781b2975a 100644 --- a/main/main.c +++ b/main/main.c @@ -1745,7 +1745,7 @@ int php_register_extensions(zend_module_entry **ptr, int count TSRMLS_DC) } /* }}} */ -#if defined(PHP_WIN32) && defined(_MSC_VER) && (_MSC_VER >= 1400) +#if defined(PHP_WIN32) && _MSC_VER >= 1400 static _invalid_parameter_handler old_invalid_parameter_handler; void dummy_invalid_parameter_handler( @@ -1795,14 +1795,8 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod WSADATA wsaData; #endif #ifdef PHP_WIN32 - DWORD dwVersion = GetVersion(); - /* Get build numbers for Windows NT or Win95 */ - if (dwVersion < 0x80000000){ - php_os="WINNT"; - } else { - php_os="WIN32"; - } -#if defined(_MSC_VER) && (_MSC_VER >= 1400) + 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) { |