patch for included gnulib bits to allow building with new mingw-w64

diff --git a/debian/patches/series b/debian/patches/series
index 3a71b82a84acafbe52e0f7ef24732f130d344263..faf2dfaae0e90ba7fa28ecf9a7c316674713b995 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 rsyncable.diff
 sigpipe.diff
 zgrep-man-diff
+gnulib-mingw-w64.diff

diff --git a/lib/msvc-inval.c b/lib/msvc-inval.c
index 72a6b6ee89de1a7c3752cb8666ee440bbccdacc2..396031e4c224b1950f8ddf3769aaddd16093db74 100644 (file)
--- a/lib/msvc-inval.c
+++ b/lib/msvc-inval.c
@@ -28,7 +28,7 @@
 
 # if MSVC_INVALID_PARAMETER_HANDLING == DEFAULT_HANDLING
 
-static void cdecl
+static void __cdecl
 gl_msvc_invalid_parameter_handler (const wchar_t *expression,
                                    const wchar_t *function,
                                    const wchar_t *file,
@@ -45,7 +45,7 @@ gl_msvc_invalid_parameter_handler (const wchar_t *expression,
 
 #  if defined _MSC_VER
 
-static void cdecl
+static void __cdecl
 gl_msvc_invalid_parameter_handler (const wchar_t *expression,
                                    const wchar_t *function,
                                    const wchar_t *file,
@@ -94,7 +94,7 @@ gl_msvc_inval_current (void)
     }
 }
 
-static void cdecl
+static void __cdecl
 gl_msvc_invalid_parameter_handler (const wchar_t *expression,
                                    const wchar_t *function,
                                    const wchar_t *file,