cvs: php-src /main main.c

pajoye Mon Jan 19 02:25:58 2009 UTC Modified files: /php-src/main main.c Log: - [MFB] fix nts build http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.791&r2=1.792&diff_format=u Index: php-src/main/main.c diff -u php-src/main/main.c:1.791 php-src/main/main.c:1.792 --- php-src/main/main.c:1.791 Fri Jan 16 10:27:52 2009 +++ php-src/main/main.c Mon Jan 19 02:25:58 2009 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: main.c,v 1.791 2009/01/16 10:27:52 pajoye Exp $ */ +/* $Id: main.c,v 1.792 2009/01/19 02:25:58 pajoye Exp $ */ /* {{{ includes */ @@ -1816,10 +1816,6 @@ #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 @@ 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);