ICU upgrade to 54.1 step 2
Update the following patches and apply to the fresh copy of icu 54.1:
configure.patch
declspec.patch
locid.patch
platform_nacl.patch
regex.patch
wpo.patch
vscomp.patch: two chunks are not necessary any more; upstream has
them.
data.build.patch
data.build_win.patch
Delete the following patches:
putil.patch: not necessary any more; upstream has it.
regex2.patch: merged to regex.patch.
col.patch: not necessary any more; upstream code changed drastically
and does not have a bug any more.
clang_win.patch: not necessary any more; upstream has it.
BUG=428145
TEST=None
R=mark@chromium.org
Review URL: https://codereview.chromium.org/822213003
diff --git a/source/common/udata.cpp b/source/common/udata.cpp
index 0d7df42..e6d8a35 100644
--- a/source/common/udata.cpp
+++ b/source/common/udata.cpp
@@ -620,7 +620,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
@@ -666,7 +666,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;
}
@@ -685,7 +685,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];
}