| Index: source/common/udata.cpp
 | 
| diff --git a/source/common/udata.cpp b/source/common/udata.cpp
 | 
| index 80bea0631ef7dc21b69a4a3dc61fa6b5b5b5edcf..d32023b7f6d7565a50051bac44ee084abb4853d2 100644
 | 
| --- a/source/common/udata.cpp
 | 
| +++ b/source/common/udata.cpp
 | 
| @@ -624,7 +624,7 @@ U_NAMESPACE_END
 | 
|   *      our common data.                                                *
 | 
|   *                                                                      *
 | 
|   *----------------------------------------------------------------------*/
 | 
| -extern "C" const ICU_Data_Header U_DATA_API U_ICUDATA_ENTRY_POINT;
 | 
| +extern "C" const DataHeader U_DATA_API U_ICUDATA_ENTRY_POINT;
 | 
|  
 | 
|  /*
 | 
|   * This would be a good place for weak-linkage declarations of
 | 
| @@ -674,7 +674,7 @@ openCommonData(const char *path,          /*  Path from OpenChoice?          */
 | 
|              }
 | 
|              int32_t i;
 | 
|              for(i = 0; i < commonDataIndex; ++i) {
 | 
| -                if(gCommonICUDataArray[i]->pHeader == &U_ICUDATA_ENTRY_POINT.hdr) {
 | 
| +                if(gCommonICUDataArray[i]->pHeader == &U_ICUDATA_ENTRY_POINT) {
 | 
|                      /* The linked-in data is already in the list. */
 | 
|                      return NULL;
 | 
|                  }
 | 
| @@ -694,7 +694,7 @@ openCommonData(const char *path,          /*  Path from OpenChoice?          */
 | 
|              setCommonICUDataPointer(uprv_getICUData_conversion(), FALSE, pErrorCode);
 | 
|          }
 | 
|          */
 | 
| -        setCommonICUDataPointer(&U_ICUDATA_ENTRY_POINT.hdr, FALSE, pErrorCode);
 | 
| +        setCommonICUDataPointer(&U_ICUDATA_ENTRY_POINT, FALSE, pErrorCode);
 | 
|          {
 | 
|              Mutex lock;
 | 
|              return gCommonICUDataArray[commonDataIndex];
 | 
| 
 |