ICU 56 step 5: Apply the remaining local patches

source/common/udata.cpp

 /*
 ******************************************************************************
 *
 *   Copyright (C) 1999-2015, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *
 ******************************************************************************
 *   file name:  udata.cpp
 *   encoding:   US-ASCII
 *   tab size:   8 (not used)
@@ skipping 606 matching lines @@
 /* ==================================================================================*/
 
 
 /*----------------------------------------------------------------------*
  *                                                                      *
  *  Add a static reference to the common data  library                  *
  *   Unless overridden by an explicit udata_setCommonData, this will be *
  *      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
  * partial-data-library access functions where each returns a pointer
  * to its data package, if it is linked in.
  */
 /*
 extern const void *uprv_getICUData_collation(void) ATTRIBUTE_WEAK;
 extern const void *uprv_getICUData_conversion(void) ATTRIBUTE_WEAK;
 */
@@ skipping 29 matching lines @@
         if(commonDataIndex >= UPRV_LENGTHOF(gCommonICUDataArray)) {
             return NULL;
         }
         {
             Mutex lock;
             if(gCommonICUDataArray[commonDataIndex] != NULL) {
                 return gCommonICUDataArray[commonDataIndex];
             }
             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;
                 }
             }
         }
 
         /* Add the linked-in data to the list. */
         /*
          * This is where we would check and call weakly linked partial-data-library
          * access functions.
          */
         /*
         if (uprv_getICUData_collation) {
             setCommonICUDataPointer(uprv_getICUData_collation(), FALSE, pErrorCode);
         }
         if (uprv_getICUData_conversion) {
             setCommonICUDataPointer(uprv_getICUData_conversion(), FALSE, pErrorCode);
         }
         */
-        setCommonICUDataPointer(&U_ICUDATA_ENTRY_POINT, FALSE, pErrorCode);
+        setCommonICUDataPointer(&U_ICUDATA_ENTRY_POINT.hdr, FALSE, pErrorCode);
         {
             Mutex lock;
             return gCommonICUDataArray[commonDataIndex];
         }
     }
 
 
     /* request is NOT for ICU Data.  */
 
     /* Find the base name portion of the supplied path.   */
@@ skipping 697 matching lines @@
         }
     }
 }
 
 
 U_CAPI void U_EXPORT2 udata_setFileAccess(UDataFileAccess access, UErrorCode * /*status*/)
 {
     // Note: this function is documented as not thread safe.
     gDataFileAccess = access;
 }