From: Bdale Garbee <bdale@gag.com>
Date: Sat, 10 Aug 2013 20:46:17 +0000 (+0200)
Subject: patch for included gnulib bits to allow building with new mingw-w64
X-Git-Tag: debian/1.6-2~3
X-Git-Url: https://git.gag.com/?p=debian%2Fgzip;a=commitdiff_plain;h=95fe2adf0246c33e549c499fdd8e10bfd3914ed5

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

diff --git a/debian/patches/series b/debian/patches/series
index 3a71b82..faf2dfa 100644
--- 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 72a6b6e..396031e 100644
--- 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,