[Libreoffice-commits] core.git: external/icu

[David Ostrovsky]

 external/icu/UnpackedTarball_icu.mk |    1 +
 external/icu/icu.vc15.patch         |   13 +++++++++++++
 2 files changed, 14 insertions(+)

New commits:
commit 9b597430c632b8c20a7595f998cd26a02e1f8656
Author: David Ostrovsky <david at ostrovsky.org>
Date:   Sat Jul 4 21:11:58 2015 +0200

    Icu: Fix compilation on VS 2015
    
    Change-Id: Iec2806dfa416bcbfa63eed2985c74c7a2ea897ea
    Reviewed-on: https://gerrit.libreoffice.org/16759
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/external/icu/UnpackedTarball_icu.mk b/external/icu/UnpackedTarball_icu.mk
index 0934289..2beeb68 100644
--- a/external/icu/UnpackedTarball_icu.mk
+++ b/external/icu/UnpackedTarball_icu.mk
@@ -29,6 +29,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\
 	external/icu/icu.changeset_36727.patch.1 \
 	external/icu/icu.changeset_36801.patch.1 \
 	$(if $(filter-out ANDROID,$(OS)),external/icu/icu4c-icudata-stdlibs.diff) \
+	external/icu/icu.vc15.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/icu/icu.vc15.patch b/external/icu/icu.vc15.patch
new file mode 100644
index 0000000..564a7cf
--- /dev/null
+++ b/external/icu/icu.vc15.patch
@@ -0,0 +1,13 @@
+--- misc/icu/source/io/ufile.c	2015-07-04 19:08:35.889168902 +0200
++++ misc/build/icu/source/io/ufile.c	2015-07-04 19:12:43.040185494 +0200
+@@ -66,7 +66,9 @@
+ #if U_PLATFORM_USES_ONLY_WIN32_API
+     if (0 <= result->fFileno && result->fFileno <= 2) {
+         /* stdin, stdout and stderr need to be special cased for Windows 98 */
+-#if _MSC_VER >= 1400
++#if _MSC_VER >= 1900
++        result->fFile = __acrt_iob_func(_fileno(f));
++#elif _MSC_VER >= 1400
+         result->fFile = &__iob_func()[_fileno(f)];
+ #else
+         result->fFile = &_iob[_fileno(f)];