|
|
|
@ -1816,10 +1816,6 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod |
|
|
|
#ifdef ZTS |
|
|
|
zend_executor_globals *executor_globals; |
|
|
|
void ***tsrm_ls; |
|
|
|
#ifdef PHP_WIN32 |
|
|
|
DWORD dwVersion = GetVersion(); |
|
|
|
#endif |
|
|
|
|
|
|
|
php_core_globals *core_globals; |
|
|
|
#endif |
|
|
|
#if defined(PHP_WIN32) || (defined(NETWARE) && defined(USE_WINSOCK)) |
|
|
|
@ -1827,12 +1823,13 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod |
|
|
|
WSADATA wsaData; |
|
|
|
#endif |
|
|
|
#ifdef PHP_WIN32 |
|
|
|
/* Get build numbers for Windows NT or Win95 */ |
|
|
|
if (dwVersion < 0x80000000){ |
|
|
|
php_os="WINNT"; |
|
|
|
} else { |
|
|
|
php_os="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) |
|
|
|
old_invalid_parameter_handler = |
|
|
|
_set_invalid_parameter_handler(dummy_invalid_parameter_handler); |
|
|
|
|