[PHP-CVS] cvs: php-src(PHP_5_3) /main main.c

[Stanislav Malyshev]

stas            Sat Jan 17 01:12:36 2009 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/main       main.c 
  Log:
  fix nts build
  
  
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.640.2.23.2.57.2.44&r2=1.640.2.23.2.57.2.45&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.640.2.23.2.57.2.44 
php-src/main/main.c:1.640.2.23.2.57.2.45
--- php-src/main/main.c:1.640.2.23.2.57.2.44    Fri Jan 16 10:26:32 2009
+++ php-src/main/main.c Sat Jan 17 01:12:36 2009
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: main.c,v 1.640.2.23.2.57.2.44 2009/01/16 10:26:32 pajoye Exp $ */
+/* $Id: main.c,v 1.640.2.23.2.57.2.45 2009/01/17 01:12:36 stas Exp $ */
 
 /* {{{ includes
  */
@@ -1705,10 +1705,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))
@@ -1716,12 +1712,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);



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php