[vlc-commits] contrib: fix windows builds for gnulib

[Rafaël Carré]

vlc/vlc-2.1 | branch: master | Rafaël Carré <funman at videolan.org> | Tue Jul  2 18:06:38 2013 +0200| [b08c52a38987d9ddbb8b9aacd0c286f61a44605a] | committer: Rafaël Carré

contrib: fix windows builds for gnulib

_set_invalid_parameter_handler is now usable in recent versions of mingw-w64
(cherry picked from commit 10ee7ff4833116d716866cd279d51a93c65e7b02)

Signed-off-by: Rafaël Carré <funman at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=b08c52a38987d9ddbb8b9aacd0c286f61a44605a
---

 contrib/src/gettext/rules.mak         |    1 +
 contrib/src/gettext/win32.patch       |   11 +++++++++++
 contrib/src/gnutls/gnutls-win32.patch |   11 +++++++++++
 3 files changed, 23 insertions(+)

diff --git a/contrib/src/gettext/rules.mak b/contrib/src/gettext/rules.mak
index 59fc40b..b594dfa 100644
--- 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
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 170d12f..d6a5f4a 100644
--- 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,