Port wpo.patch to ICU 4.6 ...

icu46/source/common/ucmndata.h

 /*
 ******************************************************************************
 *
 *   Copyright (C) 1999-2010, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *
 ******************************************************************************/
 
 
 /*----------------------------------------------------------------------------------
@@ skipping 26 matching lines @@
     uint8_t     magic2;
 } MappedData;
 
 
 typedef struct  {
     MappedData  dataHeader;
     UDataInfo   info;
 } DataHeader;
 
 typedef struct {
+    DataHeader hdr;
+    char padding[8];
+    uint32_t count, reserved;
+    /*
+    const struct {
+    const char *const name; 
+    const void *const data;
+    } toc[1];
+    */
+   int   fakeNameAndData[4];       /* TODO:  Change this header type from */
+                                   /*        pointerTOC to OffsetTOC.     */
+} ICU_Data_Header;
+
+typedef struct {
     uint32_t nameOffset;
     uint32_t dataOffset;
 } UDataOffsetTOCEntry;
 
 typedef struct {
     uint32_t count;
     UDataOffsetTOCEntry entry[2];    /* Actual size of array is from count. */
 } UDataOffsetTOC;
 
 /**
@@ skipping 42 matching lines @@
  *
  *     If a valid header and TOC are found,
  *         set the CommonDataFuncs function dispatch vector in the UDataMemory
  *             to point to the right functions for the TOC type.
  *     otherwise
  *         set an errorcode.
  */
 U_CFUNC void udata_checkCommonData(UDataMemory *pData, UErrorCode *pErrorCode);
 
 #endif