[Emacs-diffs] trunk r116235: Attempt to solve bug #16615 by using a more accurate function prototype.

[Eli Zaretskii]

------------------------------------------------------------
revno: 116235
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/16615
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sat 2014-02-01 22:10:37 +0200
message:
  Attempt to solve bug #16615 by using a more accurate function prototype.
  
   src/w32fns.c (Ffile_system_info): Use WINAPI in the function
   pointers that get the address of GetDiskFreeSpaceEx.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/w32fns.c                   w32fns.c-20091113204419-o5vbwnq5f7feedwu-945

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-02-01 11:53:10 +0000
+++ b/src/ChangeLog     2014-02-01 20:10:37 +0000
@@ -1,5 +1,8 @@
 2014-02-01  Eli Zaretskii  <address@hidden>
 
+       * w32fns.c (Ffile_system_info): Use WINAPI in the function
+       pointers that get the address of GetDiskFreeSpaceEx.  (Bug#16615)
+
        * print.c (Fexternal_debugging_output): If the argument character
        is non-ASCII, encode it with the current locale's encoding before
        writing the result to the terminal.  (Bug#16448)

=== modified file 'src/w32fns.c'
--- a/src/w32fns.c      2014-02-01 09:22:51 +0000
+++ b/src/w32fns.c      2014-02-01 20:10:37 +0000
@@ -7461,12 +7461,12 @@
      added rather late on.  */
   {
     HMODULE hKernel = GetModuleHandle ("kernel32");
-    BOOL (*pfn_GetDiskFreeSpaceExW)
+    BOOL (WINAPI *pfn_GetDiskFreeSpaceExW)
       (wchar_t *, PULARGE_INTEGER, PULARGE_INTEGER, PULARGE_INTEGER)
-      = (void *) GetProcAddress (hKernel, "GetDiskFreeSpaceExW");
-    BOOL (*pfn_GetDiskFreeSpaceExA)
+      = GetProcAddress (hKernel, "GetDiskFreeSpaceExW");
+    BOOL (WINAPI *pfn_GetDiskFreeSpaceExA)
       (char *, PULARGE_INTEGER, PULARGE_INTEGER, PULARGE_INTEGER)
-      = (void *) GetProcAddress (hKernel, "GetDiskFreeSpaceExA");
+      = GetProcAddress (hKernel, "GetDiskFreeSpaceExA");
     bool have_pfn_GetDiskFreeSpaceEx =
       (w32_unicode_filenames && pfn_GetDiskFreeSpaceExW
        || !w32_unicode_filenames && pfn_GetDiskFreeSpaceExA);