summaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-base_i18n_icu__util.cc
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-base_i18n_icu__util.cc')
-rw-r--r--www/chromium/files/patch-base_i18n_icu__util.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/www/chromium/files/patch-base_i18n_icu__util.cc b/www/chromium/files/patch-base_i18n_icu__util.cc
index 2c3a369483b6..22780040969d 100644
--- a/www/chromium/files/patch-base_i18n_icu__util.cc
+++ b/www/chromium/files/patch-base_i18n_icu__util.cc
@@ -1,15 +1,15 @@
---- base/i18n/icu_util.cc.orig 2017-06-09 16:50:47.670684000 +0200
-+++ base/i18n/icu_util.cc 2017-06-09 16:52:10.911955000 +0200
+--- base/i18n/icu_util.cc.orig 2017-09-05 21:05:11.000000000 +0200
++++ base/i18n/icu_util.cc 2017-09-06 16:47:26.158180000 +0200
@@ -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)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+-#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
-@@ -298,7 +298,7 @@
+@@ -312,7 +312,7 @@
// 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.