mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Icu: Fix compilation on VS 2015

Browse Source 
Change-Id: Iec2806dfa416bcbfa63eed2985c74c7a2ea897ea
Reviewed-on: https://gerrit.libreoffice.org/16759
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
This commit is contained in:
David Ostrovsky
2015-07-04 21:11:58 +02:00
committed by Michael Stahl
parent 5708523764
commit 9b597430c6
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
external/icu/UnpackedTarball_icu.mk vendored
View File

@@ -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:

13
external/icu/icu.vc15.patch vendored Normal file
View File

@@ -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)];