Port wpo.patch to ICU 4.6 ...

icu46/patches/wpo.patch

-Index: source/common/udata.c
+Index: source/common/udata.cpp
 ===================================================================
---- source/common/udata.c       (revision 22653)
-+++ source/common/udata.c       (working copy)
-@@ -709,7 +709,7 @@
+--- source/common/udata.cpp     (revision 68397)
++++ source/common/udata.cpp     (working copy)
+@@ -610,7 +610,7 @@
   *      our common data.                                                *
   *                                                                      *
   *----------------------------------------------------------------------*/
--extern  const DataHeader U_DATA_API U_ICUDATA_ENTRY_POINT;
-+extern  const ICU_Data_Header U_DATA_API U_ICUDATA_ENTRY_POINT;
+-extern "C" const DataHeader U_DATA_API U_ICUDATA_ENTRY_POINT;
++extern "C" const ICU_Data_Header U_DATA_API U_ICUDATA_ENTRY_POINT;
  
- 
- /*----------------------------------------------------------------------*
-@@ -745,7 +745,7 @@
-             return gCommonICUData;
+ /*
+  * 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);
          }
- 
--        tData.pHeader = &U_ICUDATA_ENTRY_POINT;
-+        tData.pHeader = &U_ICUDATA_ENTRY_POINT.hdr;
-         udata_checkCommonData(&tData, pErrorCode);
-         setCommonICUData(&tData, NULL, FALSE, pErrorCode);
-         return gCommonICUData;
+         return gCommonICUDataArray[commonDataIndex];
+     }
 Index: source/common/ucmndata.h
 ===================================================================
---- source/common/ucmndata.h    (revision 22653)
+--- source/common/ucmndata.h    (revision 68397)
 +++ source/common/ucmndata.h    (working copy)
 @@ -44,6 +44,20 @@
  } 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;
 Index: source/stubdata/stubdata.c
 ===================================================================
---- source/stubdata/stubdata.c  (revision 22653)
+--- source/stubdata/stubdata.c  (revision 68397)
 +++ source/stubdata/stubdata.c  (working copy)
 @@ -20,45 +20,34 @@
  #include "unicode/utypes.h"
  #include "unicode/udata.h"
  #include "unicode/uversion.h"
 +#include "ucmndata.h"
  
  
 -typedef struct {
 -    uint16_t headerSize;
@@ skipping 47 matching lines @@
 +            sizeof(UChar),   
 +            0,               /* reserved      */
 +            {                /* data format identifier */
 +               0x54, 0x6f, 0x43, 0x50}, /* "ToCP" */
 +               {1, 0, 0, 0},   /* format version major, minor, milli, micro */
 +               {0, 0, 0, 0}    /* dataVersion   */
 +        },
      },
      {0,0,0,0,0,0,0,0},  /* Padding[8]   */ 
      0,                  /* count        */