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]; |
} |