[vlc-commits] contrib: iconv: fix for windows store

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Thu Aug 15 11:52:22 2013 +0200| [5e1759b9cd81d2756ec32ed2e0d8c68f0a390697] | committer: Jean-Baptiste Kempf

contrib: iconv: fix for windows store

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 contrib/src/iconv/rules.mak   |    1 +
 contrib/src/iconv/win32.patch |   17 +++++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/contrib/src/iconv/rules.mak b/contrib/src/iconv/rules.mak
index 0cee05b..541dbe3 100644
--- a/contrib/src/iconv/rules.mak
+++ b/contrib/src/iconv/rules.mak
@@ -16,6 +16,7 @@ $(TARBALLS)/libiconv-$(LIBICONV_VERSION).tar.gz:
 
 iconv: libiconv-$(LIBICONV_VERSION).tar.gz .sum-iconv
 	$(UNPACK)
+	$(APPLY) $(SRC)/iconv/win32.patch
 ifdef HAVE_WIN64
 	$(APPLY) $(SRC)/iconv/libiconv-win64.patch
 endif
diff --git a/contrib/src/iconv/win32.patch b/contrib/src/iconv/win32.patch
new file mode 100644
index 0000000..cb5570d
--- /dev/null
+++ b/contrib/src/iconv/win32.patch
@@ -0,0 +1,17 @@
+--- iconv/srclib/stdio-write.c.orig	2013-08-15 11:50:20.508093720 +0200
++++ iconv/srclib/stdio-write.c	2013-08-15 11:51:36.344096864 +0200
+@@ -20,6 +20,14 @@
+ /* Specification.  */
+ #include <stdio.h>
+ 
++#ifdef _WIN32
++#include <winapifamily.h>
++
++#if !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
++#define GetFileType(h) FILE_TYPE_UNKNOWN
++#endif
++#endif
++
+ /* Replace these functions only if module 'nonblocking' or module 'sigpipe' is
+    requested.  */
+ #if GNULIB_NONBLOCKING || GNULIB_SIGPIPE