ICU upgrade to 54.1 step 2

source/common/udata.cpp

Index: source/common/udata.cpp
diff --git a/source/common/udata.cpp b/source/common/udata.cpp
index 0d7df42568dcbe22a6d6577132092d764471a032..e6d8a3550d8ad9620498ea5ad0750a6fcc9acc96 100644
--- a/source/common/udata.cpp
+++ b/source/common/udata.cpp
@@ -620,7 +620,7 @@ U_NAMESPACE_END
  *      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 @@ openCommonData(const char *path,          /*  Path from OpenChoice?          */
         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 @@ openCommonData(const char *path,          /*  Path from OpenChoice?          */
                 setCommonICUDataPointer(uprv_getICUData_conversion(), FALSE, pErrorCode);
             }
             */
-            setCommonICUDataPointer(&U_ICUDATA_ENTRY_POINT, FALSE, pErrorCode);
+            setCommonICUDataPointer(&U_ICUDATA_ENTRY_POINT.hdr, FALSE, pErrorCode);
         }
         return gCommonICUDataArray[commonDataIndex];
     }