[vlc-commits] Contribs: forgotten file in previous commit (3.1.16)
Jean-Baptiste Kempf
git at videolan.org
Mon Nov 11 18:04:13 CET 2013
vlc/vlc-2.1 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Fri Nov 8 11:04:29 2013 +0100| [cc200e038995c153685c249a44115dce3dbe8fbe] | committer: Jean-Baptiste Kempf
Contribs: forgotten file in previous commit (3.1.16)
(cherry picked from commit 96152a1e85a7fd3f65176ede31c7ade4f8bd6407)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=cc200e038995c153685c249a44115dce3dbe8fbe
---
contrib/src/gnutls/gnutls-win32.patch | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/contrib/src/gnutls/gnutls-win32.patch b/contrib/src/gnutls/gnutls-win32.patch
index 6348d94..c0c540a 100644
--- a/contrib/src/gnutls/gnutls-win32.patch
+++ b/contrib/src/gnutls/gnutls-win32.patch
@@ -15,17 +15,6 @@
# endif
+#endif
#endif /* !HAVE_DECL_GAI_STRERROR */
---- 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,
--- gnutls-3.1.14/lib/gnutls.pc.in.orig 2013-09-17 18:14:16.270374773 +0200
+++ gnutls-3.1.14/lib/gnutls.pc.in 2013-09-17 18:16:10.232464936 +0200
@@ -18,7 +18,7 @@
More information about the vlc-commits
mailing list