contrib: fix windows builds for gnulib

_set_invalid_parameter_handler is now usable in recent versions of mingw-w64

diff --git a/contrib/src/gettext/rules.mak b/contrib/src/gettext/rules.mak
index 59fc40b472813e08f486f838e9934ecf40375524..b594dfad5310c7a4be6eda8168ad54fa7cf74b79 100644 (file)
--- a/contrib/src/gettext/rules.mak
+++ b/contrib/src/gettext/rules.mak
@@ -15,6 +15,7 @@ $(TARBALLS)/gettext-$(GETTEXT_VERSION).tar.gz:
 
 gettext: gettext-$(GETTEXT_VERSION).tar.gz .sum-gettext
        $(UNPACK)
+       $(APPLY) $(SRC)/gettext/win32.patch
        $(MOVE)
 
 DEPS_gettext = iconv $(DEPS_iconv)

diff --git a/contrib/src/gettext/win32.patch b/contrib/src/gettext/win32.patch
new file mode 100644 (file)
index 0000000..417e73f
--- /dev/null
+++ b/contrib/src/gettext/win32.patch
@@ -0,0 +1,11 @@
+--- gettext/gettext-runtime/gnulib-lib/msvc-inval.c.orig       2013-07-02 17:44:02.000000000 +0200
++++ gettext/gettext-runtime/gnulib-lib/msvc-inval.c    2013-07-02 17:42:58.000000000 +0200
+@@ -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,

diff --git a/contrib/src/gnutls/gnutls-win32.patch b/contrib/src/gnutls/gnutls-win32.patch
index 170d12ffd6f7592f6487b80fada9fb5bf8abb276..d6a5f4ac4fa3222223f2417b526d1b00fa9eeba9 100644 (file)
--- a/contrib/src/gnutls/gnutls-win32.patch
+++ b/contrib/src/gnutls/gnutls-win32.patch
@@ -26,3 +26,14 @@
  Libs.private: @LTLIBNETTLE@ @LTLIBZ@ @LTLIBINTL@ @LIBSOCKET@ @LTLIBPTHREAD@ @LTLIBICONV@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@ @LIB_CLOCK_GETTIME@
  @GNUTLS_REQUIRES_PRIVATE@
  Cflags: -I${includedir}
+--- gnutls/gl/msvc-inval.c.orig        2013-07-02 17:57:58.000000000 +0200
++++ gnutls/gl/msvc-inval.c     2013-07-02 17:58:05.000000000 +0200
+@@ -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,