nobu	2009-03-05 14:52:51 +0900 (Thu, 05 Mar 2009)

  New Revision: 22781

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=22781

  Log:
    * win32/win32.c (rb_w32_sysinit): initializes version info first.

  Modified files:
    trunk/ChangeLog
    trunk/win32/win32.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 22780)
+++ ChangeLog	(revision 22781)
@@ -1,5 +1,7 @@
-Thu Mar  5 13:21:43 2009  Nobuyoshi Nakada  <nobu@r...>
+Thu Mar  5 14:52:46 2009  Nobuyoshi Nakada  <nobu@r...>
 
+	* win32/win32.c (rb_w32_sysinit): initializes version info first.
+
 	* win32/win32.c (rb_w32_osid): always define for binary compatibility.
 
 Thu Mar  5 11:52:16 2009  Nobuyoshi Nakada  <nobu@r...>
Index: win32/win32.c
===================================================================
--- win32/win32.c	(revision 22780)
+++ win32/win32.c	(revision 22781)
@@ -196,10 +196,6 @@
 static const char *NTLoginName;
 
 static OSVERSIONINFO osver;
-#ifdef _M_IX86
-static DWORD Win32System = (DWORD)-1;
-#endif
-static DWORD Win32Version = (DWORD)-1;
 
 static void
 get_version(void)
@@ -207,28 +203,20 @@
     memset(&osver, 0, sizeof(OSVERSIONINFO));
     osver.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
     GetVersionEx(&osver);
-    Win32System = osver.dwPlatformId;
-    Win32Version = osver.dwMajorVersion;
 }
 
 #ifdef _M_IX86
 DWORD
 rb_w32_osid(void)
 {
-    if (osver.dwPlatformId != Win32System) {
-	get_version();
-    }
-    return (Win32System);
+    return osver.dwPlatformId;
 }
 #endif
 
 static DWORD
 rb_w32_osver(void)
 {
-    if (osver.dwMajorVersion != Win32Version) {
-	get_version();
-    }
-    return (Win32Version);
+    return osver.dwMajorVersion;
 }
 
 #define IsWinNT() rb_w32_iswinnt()
@@ -552,6 +540,8 @@
     set_pioinfo_extra();
 #endif
 
+    get_version();
+
     //
     // subvert cmd.exe's feeble attempt at command line parsing
     //

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/