mirror of
https://git.freebsd.org/ports.git
synced 2025-06-21 20:50:31 -04:00
d90bf58cf8
- Make existing patches apply cleanly Changelog: https://chromium.googlesource.com/chromium/src/+log/72.0.3626.121..73.0.3683.86?pretty=fuller&n=10000 Submitted by: Matthias Wolf MFH: 2019Q2
20 lines
909 B
C++
20 lines
909 B
C++
--- base/i18n/icu_util.cc.orig 2019-03-11 22:00:51 UTC
|
|
+++ 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
|
|
|
|
@@ -315,7 +315,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
|