Changeset 2452 for trunk/src/kmk/variable.c

Timestamp:

Jul 7, 2011, 9:33:48 PM (14 years ago)

Author:

bird

Message:

kmk: build fix.

File:

• trunk/src/kmk/variable.c (modified) (4 diffs)

trunk/src/kmk/variable.c

@@ -1087 +1087 @@
 
 
-#if defined(KMK) && !defined(WINDOWS32) 
+#if defined(KMK) && !defined(WINDOWS32)
 /* Parses out the next number from the uname release level string.  Fast
    forwards to the end of the string when encountering some non-conforming
    chars. */
- 
+
 static unsigned long parse_release_number (const char **ppsz)
 {
@@ -1132 +1132 @@
   struct variable *envvar2;
 # ifdef WINDOWS32
-  OSVERSIONINFOEX vix;
+  OSVERSIONINFOEX oix;
 # else
   struct utsname uts;
@@ -1213 +1213 @@
   /* The host kernel version. */
 #if defined(WINDOWS32)
-  memset (&oix, sizeof (oix));
+  memset (&oix, '\0', sizeof (oix));
   oix.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
   if (!GetVersionEx ((LPOSVERSIONINFO)&oix))
@@ -1229 +1229 @@
     }
   else
-    { 
+    {
       ulMajor = oix.dwPlatformId == 1 ? 0 /*Win95/98/ME*/
-              ? oix.dwPlatformId == 3 ? 1 /*WinCE*/
+              : oix.dwPlatformId == 3 ? 1 /*WinCE*/
               : 2; /*??*/
       ulMinor = oix.dwMajorVersion;
       ulPatch = oix.dwMinorVersion;
-      ul4th   = oix.WservicePackMajor;
+      ul4th   = oix.wServicePackMajor;
     }
 #else