Commit 10ee7ff4 authored by Rafaël Carré's avatar Rafaël Carré

contrib: fix windows builds for gnulib

_set_invalid_parameter_handler is now usable in recent versions of mingw-w64
parent 7c56e272
......@@ -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)
......
--- 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,
......@@ -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,
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment