diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2015-07-04 21:11:58 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2017-04-23 21:58:35 +0200 |
| commit | 23f614f274487319aa5e07bc074bd01c1cb36c31 (patch) | |
| tree | de08ab46032d01bce9d73b2f8530c3131c27d216 | |
| parent | db8608fdcb8d6ed2915fea54631127ef634329c4 (diff) | |
Icu: Fix compilation on VS 2015
Change-Id: Iec2806dfa416bcbfa63eed2985c74c7a2ea897ea
Reviewed-on: https://gerrit.libreoffice.org/16759
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit 9b597430c632b8c20a7595f998cd26a02e1f8656)
| -rw-r--r-- | external/icu/UnpackedTarball_icu.mk | 1 | ||||
| -rw-r--r-- | external/icu/icu.vc15.patch | 13 |
2 files changed, 14 insertions, 0 deletions
diff --git a/external/icu/UnpackedTarball_icu.mk b/external/icu/UnpackedTarball_icu.mk index 09342893fc8c..2beeb68b89a0 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 000000000000..564a7cf82977 --- /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)]; |