summaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-base_files_file__path__unittest.cc
diff options
context:
space:
mode:
authorJoseph Mingrone <jrm@FreeBSD.org>2020-12-01 04:06:37 +0000
committerJoseph Mingrone <jrm@FreeBSD.org>2020-12-01 04:06:37 +0000
commita0dbfe2fb016ec18b858d0857d8c3ce21662d29c (patch)
tree0454226a8e0acc85a44cfa5e09502134947dbdef /www/chromium/files/patch-base_files_file__path__unittest.cc
parentgames/iqpuzzle: Update 1.2.0 -> 1.2.1 (diff)
www/chromium: Update to version 87.0.4280.66
Submitted by: Matthias Wolf, cem, rene Obtained from: Some patches from OpenBSD port (robert@openbsd.org)
Diffstat (limited to 'www/chromium/files/patch-base_files_file__path__unittest.cc')
-rw-r--r--www/chromium/files/patch-base_files_file__path__unittest.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/www/chromium/files/patch-base_files_file__path__unittest.cc b/www/chromium/files/patch-base_files_file__path__unittest.cc
index 26521d022831..ca4d131daf7c 100644
--- a/www/chromium/files/patch-base_files_file__path__unittest.cc
+++ b/www/chromium/files/patch-base_files_file__path__unittest.cc
@@ -1,11 +1,11 @@
---- base/files/file_path_unittest.cc.orig 2020-03-16 18:39:41 UTC
+--- base/files/file_path_unittest.cc.orig 2020-11-13 06:36:34 UTC
+++ base/files/file_path_unittest.cc
@@ -1149,7 +1149,7 @@ TEST_F(FilePathTest, FromUTF8Unsafe_And_AsUTF8Unsafe)
"\xEF\xBC\xA1\xEF\xBC\xA2\xEF\xBC\xA3.txt" },
};
--#if !defined(SYSTEM_NATIVE_UTF8) && defined(OS_LINUX)
-+#if !defined(SYSTEM_NATIVE_UTF8) && (defined(OS_LINUX) || defined(OS_BSD))
+-#if !defined(SYSTEM_NATIVE_UTF8) && (defined(OS_LINUX) || defined(OS_CHROMEOS))
++#if !defined(SYSTEM_NATIVE_UTF8) && (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD))
ScopedLocale locale("en_US.UTF-8");
#endif