Differential D18757 Diff 55427 www/qt5-webengine/files/patch-src_3rdparty_chromium_base_i18n_icu__util.cc
Changeset View
Changeset View
Standalone View
Standalone View
www/qt5-webengine/files/patch-src_3rdparty_chromium_base_i18n_icu__util.cc
- This file was added.
| Property | Old Value | New Value |
|---|---|---|
| fbsd:nokeywords | null | yes \ No newline at end of property |
| svn:eol-style | null | native \ No newline at end of property |
| svn:mime-type | null | text/plain \ No newline at end of property |
| --- src/3rdparty/chromium/base/i18n/icu_util.cc.orig 2018-11-13 18:25:11 UTC | |||||
| +++ src/3rdparty/chromium/base/i18n/icu_util.cc | |||||
| @@ -20,7 +20,7 @@ | |||||
| #include "build/build_config.h" | |||||
| #include "third_party/icu/source/common/unicode/putil.h" | |||||
| #include "third_party/icu/source/common/unicode/udata.h" | |||||
| -#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_ANDROID) | |||||
| +#if ((defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)) || defined(OS_ANDROID) | |||||
| #include "third_party/icu/source/i18n/unicode/timezone.h" | |||||
| #endif | |||||
| @@ -320,7 +320,7 @@ bool InitializeICU() { | |||||
| // TODO(jungshik): Some callers do not care about tz at all. If necessary, | |||||
| // add a boolean argument to this function to init'd the default tz only | |||||
| // when requested. | |||||
| -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) | |||||
| +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) | |||||
| if (result) | |||||
| std::unique_ptr<icu::TimeZone> zone(icu::TimeZone::createDefault()); | |||||
| #endif | |||||