diff options
| author | jshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-10 20:13:17 +0000 |
|---|---|---|
| committer | jshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-10 20:13:17 +0000 |
| commit | 6b487bf68418cc4f11c2db9cc8927768133c6a83 (patch) | |
| tree | 7beeeec98c6fb61e16dec040c0d5ae8bb027dca7 /third_party/sqlite/misc.patch | |
| parent | 7a65ac8a11916a4f13a7ed69346a4bda41e2d0ba (diff) | |
| download | chromium_src-6b487bf68418cc4f11c2db9cc8927768133c6a83.zip chromium_src-6b487bf68418cc4f11c2db9cc8927768133c6a83.tar.gz chromium_src-6b487bf68418cc4f11c2db9cc8927768133c6a83.tar.bz2 | |
Drop the icu version number from the name of icu data file on Windows.
This is to avoid having to change a bunch of build/release configuration files
everytime ICU version is changed.
This will bring in the following two CLs in ICU and googleurl:
http://codereview.chromium.org/6625032
http://codereview.chromium.org/6623060
BUG=74076
TEST=Chrome can be built and a binary built runs fine with an accompanying Chrome CL in place.
Review URL: http://codereview.chromium.org/6624060
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77684 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/sqlite/misc.patch')
| -rw-r--r-- | third_party/sqlite/misc.patch | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/third_party/sqlite/misc.patch b/third_party/sqlite/misc.patch index e2f0c55..b90eba5 100644 --- a/third_party/sqlite/misc.patch +++ b/third_party/sqlite/misc.patch @@ -1018,9 +1018,9 @@ Index: src/shell_icu_linux.c Index: src/shell_icu_win.c =================================================================== --- src/shell_icu_win.c 1969-12-31 16:00:00.000000000 -0800 -+++ src/shell_icu_win.c 2009-09-09 12:29:11.000000000 -0700 -@@ -0,0 +1,34 @@ -+/* Copyright 2007 Google Inc. All Rights Reserved. ++++ src/shell_icu_win.c 2011-03-03 14:29:11.000000000 -0700 +@@ -0,0 +1,32 @@ ++/* Copyright 2011 Google Inc. All Rights Reserved. +**/ + +#include <windows.h> @@ -1038,10 +1038,8 @@ Index: src/shell_icu_win.c + FARPROC addr; + UErrorCode err; + -+ wchar_t dll_name[12]; -+ wsprintf(dll_name, L"icudt%2S.dll", U_ICU_VERSION_SHORT); -+ dll_name[11] = L'\0'; -+ module = LoadLibrary(dll_name); ++ // Chrome dropped U_ICU_VERSION_SHORT from the icu data dll name. ++ module = LoadLibrary(L"icudt.dll"); + if (!module) + return 0; + |