diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-29 00:32:52 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-29 00:32:52 +0000 |
| commit | e43eddf1a5887c4b249af3daa024c1107ce254a1 (patch) | |
| tree | 994df09c627978ef3fb93a9fadebd00bebbcb31d /base/i18n | |
| parent | a672cb9dce10306f3b149802653dbb554b326a44 (diff) | |
| download | chromium_src-e43eddf1a5887c4b249af3daa024c1107ce254a1.zip chromium_src-e43eddf1a5887c4b249af3daa024c1107ce254a1.tar.gz chromium_src-e43eddf1a5887c4b249af3daa024c1107ce254a1.tar.bz2 | |
Changes to base/ from a combination of FreeBSD and OpenBSD patches.
Review URL: http://codereview.chromium.org/495002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35321 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/i18n')
| -rw-r--r-- | base/i18n/file_util_icu.cc | 2 | ||||
| -rw-r--r-- | base/i18n/file_util_icu_unittest.cc | 2 | ||||
| -rw-r--r-- | base/i18n/icu_util.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/base/i18n/file_util_icu.cc b/base/i18n/file_util_icu.cc index 4d33e3a..f62a05e 100644 --- a/base/i18n/file_util_icu.cc +++ b/base/i18n/file_util_icu.cc @@ -146,7 +146,7 @@ void ReplaceIllegalCharactersInPath(FilePath::StringType* file_name, // Windows uses UTF-16 encoding for filenames. U16_NEXT(file_name->data(), cursor, static_cast<int>(file_name->length()), code_point); -#elif defined(OS_LINUX) +#elif defined(OS_POSIX) // Linux doesn't actually define an encoding. It basically allows anything // except for a few special ASCII characters. unsigned char cur_char = static_cast<unsigned char>((*file_name)[cursor++]); diff --git a/base/i18n/file_util_icu_unittest.cc b/base/i18n/file_util_icu_unittest.cc index b46fe55..1da8a93 100644 --- a/base/i18n/file_util_icu_unittest.cc +++ b/base/i18n/file_util_icu_unittest.cc @@ -35,7 +35,7 @@ class FileUtilICUTest : public PlatformTest { FilePath test_dir_; }; -#if defined(OS_LINUX) +#if defined(OS_POSIX) && !defined(OS_MACOSX) // Linux disallows some evil ASCII characters, but passes all non-ASCII. static const struct goodbad_pair { diff --git a/base/i18n/icu_util.cc b/base/i18n/icu_util.cc index bccc1ab..066534c 100644 --- a/base/i18n/icu_util.cc +++ b/base/i18n/icu_util.cc @@ -31,7 +31,7 @@ #define ICU_UTIL_DATA_IMPL ICU_UTIL_DATA_SHARED #elif defined(OS_MACOSX) #define ICU_UTIL_DATA_IMPL ICU_UTIL_DATA_STATIC -#elif defined(OS_LINUX) +#elif defined(OS_POSIX) #define ICU_UTIL_DATA_IMPL ICU_UTIL_DATA_FILE #endif |