]> granicus.if.org Git - php/commitdiff
- [MFB] fix nts build
authorPierre Joye <pajoye@php.net>
Mon, 19 Jan 2009 02:25:58 +0000 (02:25 +0000)
committerPierre Joye <pajoye@php.net>
Mon, 19 Jan 2009 02:25:58 +0000 (02:25 +0000)
main/main.c

index 8f2b8088cda53c2f1801d730a420d7d061f2b18d..4b3965f570cab2495a5b78727dd26a4ed4c17da8 100644 (file)
@@ -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);