tmpfile, clean-temp: Fix invocation of GetVersionEx.
authorJohn Darrington <john@darrington.wattle.id.au>
Wed, 20 Jun 2012 21:30:48 +0000 (23:30 +0200)
committerBruno Haible <bruno@clisp.org>
Wed, 20 Jun 2012 21:31:15 +0000 (23:31 +0200)
* lib/tmpfile.c (supports_delete_on_close): Initialize parameter for
GetVersionEx correctly.
* lib/clean-temp.c (supports_delete_on_close): Likewise.

ChangeLog
lib/clean-temp.c
lib/tmpfile.c

index 34bcd6d..199b06c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-06-20  John Darrington  <john@darrington.wattle.id.au>  (tiny change)
+
+       tmpfile, clean-temp: Fix invocation of GetVersionEx.
+       * lib/tmpfile.c (supports_delete_on_close): Initialize parameter for
+       GetVersionEx correctly.
+       * lib/clean-temp.c (supports_delete_on_close): Likewise.
+
 2012-06-20  Bruno Haible  <bruno@clisp.org>
 
        fdopen: Allow implementations that don't reject invalid fd arguments.
index b05550a..ef926e5 100644 (file)
@@ -583,6 +583,11 @@ supports_delete_on_close ()
     {
       OSVERSIONINFO v;
 
+      /* According to
+         <http://msdn.microsoft.com/en-us/library/windows/desktop/ms724451(v=vs.85).aspx>
+         this structure must be initialised as follows:  */
+      v.dwOSVersionInfoSize = sizeof (OSVERSIONINFO);
+
       if (GetVersionEx (&v))
         known = (v.dwPlatformId == VER_PLATFORM_WIN32_NT ? 1 : -1);
       else
index 8249525..2362a65 100644 (file)
@@ -54,6 +54,11 @@ supports_delete_on_close ()
     {
       OSVERSIONINFO v;
 
+      /* According to
+         <http://msdn.microsoft.com/en-us/library/windows/desktop/ms724451(v=vs.85).aspx>
+         this structure must be initialised as follows:  */
+      v.dwOSVersionInfoSize = sizeof (OSVERSIONINFO);
+
       if (GetVersionEx (&v))
         known = (v.dwPlatformId == VER_PLATFORM_WIN32_NT ? 1 : -1);
       else