Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(225)

Unified Diff: icu46/source/common/udata.cpp

Issue 6462019: Port wpo.patch to ICU 4.6 ... (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/
Patch Set: Created 9 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « icu46/source/common/ucmndata.h ('k') | icu46/source/stubdata/stubdata.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: icu46/source/common/udata.cpp
===================================================================
--- icu46/source/common/udata.cpp (revision 68397)
+++ icu46/source/common/udata.cpp (working copy)
@@ -610,7 +610,7 @@
* our common data. *
* *
*----------------------------------------------------------------------*/
-extern "C" const DataHeader U_DATA_API U_ICUDATA_ENTRY_POINT;
+extern "C" const ICU_Data_Header U_DATA_API U_ICUDATA_ENTRY_POINT;
/*
* This would be a good place for weak-linkage declarations of
@@ -656,7 +656,7 @@
if(gCommonICUDataArray[commonDataIndex] == NULL) {
int32_t i;
for(i = 0; i < commonDataIndex; ++i) {
- if(gCommonICUDataArray[i]->pHeader == &U_ICUDATA_ENTRY_POINT) {
+ if(gCommonICUDataArray[i]->pHeader == &U_ICUDATA_ENTRY_POINT.hdr) {
/* The linked-in data is already in the list. */
return NULL;
}
@@ -675,7 +675,7 @@
setCommonICUDataPointer(uprv_getICUData_conversion(), FALSE, pErrorCode);
}
*/
- setCommonICUDataPointer(&U_ICUDATA_ENTRY_POINT, FALSE, pErrorCode);
+ setCommonICUDataPointer(&U_ICUDATA_ENTRY_POINT.hdr, FALSE, pErrorCode);
}
return gCommonICUDataArray[commonDataIndex];
}
« no previous file with comments | « icu46/source/common/ucmndata.h ('k') | icu46/source/stubdata/stubdata.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698