icu52/patches/wpo.patch - Issue 224943002: icu local change part1

Side by Side Diff: icu52/patches/wpo.patch

Issue 224943002: icu local change part1 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/

Patch Set: fix typos in uconfig.h and putil.patch Created 6 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

« icu52/README.chromium ('K') | « icu52/patches/vscomp.patch ('k') | icu52/patches/xopen_source.patch » ('j') | icu52/scripts/eucjp_gen.sh » ('J')

OLD	NEW
1 Index: source/common/udata.cpp	1 Index: source/common/udata.cpp

2 ===================================================================	2 ===================================================================

3 --- source/common/udata.cpp» (revision 68397)	3 --- source/common/udata.cpp» (revision 259715)

4 +++ source/common/udata.cpp (working copy)	4 +++ source/common/udata.cpp (working copy)

5 @@ -610,7 +610,7 @@	5 @@ -621,7 +621,7 @@

6 * our common data. *	6 * our common data. *

7 * *	7 * *

8 ----------------------------------------------------------------------/	8 ----------------------------------------------------------------------/

9 -extern "C" const DataHeader U_DATA_API U_ICUDATA_ENTRY_POINT;	9 -extern "C" const DataHeader U_DATA_API U_ICUDATA_ENTRY_POINT;

10 +extern "C" const ICU_Data_Header U_DATA_API U_ICUDATA_ENTRY_POINT;	10 +extern "C" const ICU_Data_Header U_DATA_API U_ICUDATA_ENTRY_POINT;

11	11

12 /*	12 /*

13 * This would be a good place for weak-linkage declarations of	13 * This would be a good place for weak-linkage declarations of

14 @@ -656,7 +656,7 @@	14 @@ -667,7 +667,7 @@

15 if(gCommonICUDataArray[commonDataIndex] == NULL) {	15 if(gCommonICUDataArray[commonDataIndex] == NULL) {

16 int32_t i;	16 int32_t i;

17 for(i = 0; i < commonDataIndex; ++i) {	17 for(i = 0; i < commonDataIndex; ++i) {

18 - if(gCommonICUDataArray[i]->pHeader == &U_ICUDATA_ENTRY_POINT) {	18 - if(gCommonICUDataArray[i]->pHeader == &U_ICUDATA_ENTRY_POINT) {

19 + if(gCommonICUDataArray[i]->pHeader == &U_ICUDATA_ENTRY_POINT.hd r) {	19 + if(gCommonICUDataArray[i]->pHeader == &U_ICUDATA_ENTRY_POINT.hd r) {

20 /* The linked-in data is already in the list. */	20 /* The linked-in data is already in the list. */

21 return NULL;	21 return NULL;

22 }	22 }

23 @@ -675,7 +675,7 @@	23 @@ -686,7 +686,7 @@

24 setCommonICUDataPointer(uprv_getICUData_conversion(), FALSE, pE rrorCode);	24 setCommonICUDataPointer(uprv_getICUData_conversion(), FALSE, pE rrorCode);

25 }	25 }

26 */	26 */

27 - setCommonICUDataPointer(&U_ICUDATA_ENTRY_POINT, FALSE, pErrorCode);	27 - setCommonICUDataPointer(&U_ICUDATA_ENTRY_POINT, FALSE, pErrorCode);

28 + setCommonICUDataPointer(&U_ICUDATA_ENTRY_POINT.hdr, FALSE, pErrorCo de);	28 + setCommonICUDataPointer(&U_ICUDATA_ENTRY_POINT.hdr, FALSE, pErrorCo de);

29 }	29 }

30 return gCommonICUDataArray[commonDataIndex];	30 return gCommonICUDataArray[commonDataIndex];

31 }	31 }

32 Index: source/common/ucmndata.h	32 Index: source/common/ucmndata.h

33 ===================================================================	33 ===================================================================

(...skipping 83 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
117 + sizeof(UChar),	117 + sizeof(UChar),

118 + 0, /* reserved */	118 + 0, /* reserved */

119 + { /* data format identifier */	119 + { /* data format identifier */

120 + 0x54, 0x6f, 0x43, 0x50}, /* "ToCP" */	120 + 0x54, 0x6f, 0x43, 0x50}, /* "ToCP" */

121 + {1, 0, 0, 0}, /* format version major, minor, milli, micro */	121 + {1, 0, 0, 0}, /* format version major, minor, milli, micro */

122 + {0, 0, 0, 0} /* dataVersion */	122 + {0, 0, 0, 0} /* dataVersion */

123 + },	123 + },

124 },	124 },

125 {0,0,0,0,0,0,0,0}, /* Padding[8] */	125 {0,0,0,0,0,0,0,0}, /* Padding[8] */

126 0, /* count */	126 0, /* count */

OLD	NEW