[vlc-commits] contrib/iconv: fix C11 build

[Thomas Guillem]

vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Thu Sep 24 18:08:56 2015 +0200| [86beec0006157d85a93830931c31fba024a8eb3c] | committer: Thomas Guillem

contrib/iconv: fix C11 build

C11 removed gets, therefore the iconv gets warning fails.

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

 contrib/src/iconv/libiconv-c11.patch |   19 +++++++++++++++++++
 contrib/src/iconv/rules.mak          |    1 +
 2 files changed, 20 insertions(+)

diff --git a/contrib/src/iconv/libiconv-c11.patch b/contrib/src/iconv/libiconv-c11.patch
new file mode 100644
index 0000000..adcc8d1
--- /dev/null
+++ b/contrib/src/iconv/libiconv-c11.patch
@@ -0,0 +1,19 @@
+--- iconv/srclib/stdio.in.h.orig	2015-09-24 17:57:58.668232325 +0200
++++ iconv/srclib/stdio.in.h	2015-09-24 17:56:16.941881263 +0200
+@@ -679,6 +679,8 @@
+ # endif
+ #endif
+ 
++#if !defined __USE_ISOC11 \
++    || (defined __cplusplus && __cplusplus <= 201103L)
+ #if @GNULIB_GETS@
+ # if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@
+ #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+@@ -697,6 +699,7 @@
+    always declared, since it is required by C89.  */
+ _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
+ #endif
++#endif
+ 
+ 
+ #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@
diff --git a/contrib/src/iconv/rules.mak b/contrib/src/iconv/rules.mak
index 176619f..0aea528 100644
--- a/contrib/src/iconv/rules.mak
+++ b/contrib/src/iconv/rules.mak
@@ -18,6 +18,7 @@ iconv: libiconv-$(LIBICONV_VERSION).tar.gz .sum-iconv
 	$(UNPACK)
 	$(APPLY) $(SRC)/iconv/win32.patch
 	$(APPLY) $(SRC)/iconv/bins.patch
+	$(APPLY) $(SRC)/iconv/libiconv-c11.patch
 ifdef HAVE_WIN64
 	$(APPLY) $(SRC)/iconv/libiconv-win64.patch
 endif