diff options
| author | jshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-07 18:40:29 +0000 |
|---|---|---|
| committer | jshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-07 18:40:29 +0000 |
| commit | 0e3ffa253cb1e424430669b76b30223e810c9a86 (patch) | |
| tree | 43c3256cca7b4b72a43539f7d3082281cac55988 /base/i18n | |
| parent | 03efe6ca7ab0a34cfb877b3fec69f462cc3b05f4 (diff) | |
| download | chromium_src-0e3ffa253cb1e424430669b76b30223e810c9a86.zip chromium_src-0e3ffa253cb1e424430669b76b30223e810c9a86.tar.gz chromium_src-0e3ffa253cb1e424430669b76b30223e810c9a86.tar.bz2 | |
Change ICU_UTIL_DATA_IMPL on Linux to match the reality.
We've bundled the ICU data file for 'ages' on Linux, but ICU_UTIL_DATA_IMPL on Linux
is still set to ICU_UTIL_DATA_FILE.
Apparently, this hasn't been noticed because u_setDataDirectory and
udata_setFileAccess just set the global variable pointing to the data file
location. This is not totally free because u_setDataDirectory does some
locking/unlocking.
BUG=NONE
TEST=Builds go through on Linux and binaries (chrome, test, etc) run just fine.
Review URL: http://codereview.chromium.org/3329012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58725 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/i18n')
| -rw-r--r-- | base/i18n/icu_util.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/base/i18n/icu_util.cc b/base/i18n/icu_util.cc index 066534c..d378a25 100644 --- a/base/i18n/icu_util.cc +++ b/base/i18n/icu_util.cc @@ -29,10 +29,8 @@ #if defined(OS_WIN) #define ICU_UTIL_DATA_IMPL ICU_UTIL_DATA_SHARED -#elif defined(OS_MACOSX) +#else #define ICU_UTIL_DATA_IMPL ICU_UTIL_DATA_STATIC -#elif defined(OS_POSIX) -#define ICU_UTIL_DATA_IMPL ICU_UTIL_DATA_FILE #endif #endif // ICU_UTIL_DATA_IMPL @@ -77,7 +75,7 @@ bool Initialize() { udata_setCommonData(reinterpret_cast<void*>(addr), &err); return err == U_ZERO_ERROR; #elif (ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_STATIC) - // Mac bundles the ICU data in. + // Mac/Linux bundle the ICU data in. return true; #elif (ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_FILE) // For now, expect the data file to be alongside the executable. |