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.

diff --git a/src/ChangeLog b/src/ChangeLog
index 6c52ad45be203d99b0d8e9e0d81380fd1108beb7..c87b7e8b8e706d064591113f6375322b059c0398 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2014-02-01  Eli Zaretskii  <eliz@gnu.org>
 
+       * 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)

diff --git a/src/w32fns.c b/src/w32fns.c
index 397b1796215af29fea8e3594e1c3a3f7f64676e9..b688512da88852d4af264305e396683534ca8920 100644 (file)
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -7461,12 +7461,12 @@ If the underlying system call fails, value is nil.  */)
      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);