patches/utf32.patch - Issue 2442923002: ICU update to 58 part 2

Side by Side Diff: patches/utf32.patch

Issue 2442923002: ICU update to 58 part 2 (Closed)

Patch Set: apply more patches and updates; almost ready to roll Created 4 years, 1 month ago

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

Jump to:

OLD	NEW
1 diff --git a/source/common/ucnv_bld.cpp b/source/common/ucnv_bld.cpp	1 diff --git a/source/common/ucnv_bld.cpp b/source/common/ucnv_bld.cpp

2 index 3c6b0e3..77fd0e6 100644	2 index 078f293..a8c41cc 100644

3 --- a/source/common/ucnv_bld.cpp	3 --- a/source/common/ucnv_bld.cpp

4 +++ b/source/common/ucnv_bld.cpp	4 +++ b/source/common/ucnv_bld.cpp

5 @@ -65,11 +65,7 @@ converterData[UCNV_NUMBER_OF_SUPPORTED_CONVERTER_TYPES]={	5 @@ -67,11 +67,7 @@ converterData[UCNV_NUMBER_OF_SUPPORTED_CONVERTER_TYPES]={

6	6

7 &_Latin1Data,	7 &_Latin1Data,

8 &_UTF8Data, &_UTF16BEData, &_UTF16LEData,	8 &_UTF8Data, &_UTF16BEData, &_UTF16LEData,

9 -#if UCONFIG_ONLY_HTML_CONVERSION	9 -#if UCONFIG_ONLY_HTML_CONVERSION

10 - NULL, NULL,	10 - NULL, NULL,

11 -#else	11 -#else

12 &_UTF32BEData, &_UTF32LEData,	12 &_UTF32BEData, &_UTF32LEData,

13 -#endif	13 -#endif

14 NULL,	14 NULL,

15	15

16 #if UCONFIG_NO_LEGACY_CONVERSION	16 #if UCONFIG_NO_LEGACY_CONVERSION

17 @@ -103,7 +99,7 @@ converterData[UCNV_NUMBER_OF_SUPPORTED_CONVERTER_TYPES]={	17 @@ -105,7 +101,7 @@ converterData[UCNV_NUMBER_OF_SUPPORTED_CONVERTER_TYPES]={

18	18

19 &_ASCIIData,	19 &_ASCIIData,

20 #if UCONFIG_ONLY_HTML_CONVERSION	20 #if UCONFIG_ONLY_HTML_CONVERSION

21 - NULL, NULL, &_UTF16Data, NULL, NULL, NULL,	21 - NULL, NULL, &_UTF16Data, NULL, NULL, NULL,

22 + NULL, NULL, &_UTF16Data, &_UTF32Data, NULL, NULL,	22 + NULL, NULL, &_UTF16Data, &_UTF32Data, NULL, NULL,

23 #else	23 #else

24 &_UTF7Data, &_Bocu1Data, &_UTF16Data, &_UTF32Data, &_CESU8Data, &_IMAPData,	24 &_UTF7Data, &_Bocu1Data, &_UTF16Data, &_UTF32Data, &_CESU8Data, &_IMAPData,

25 #endif	25 #endif

26 @@ -168,7 +164,6 @@ static struct {	26 @@ -170,7 +166,6 @@ static struct {

27 { "utf16oppositeendian", UCNV_UTF16_BigEndian},	27 { "utf16oppositeendian", UCNV_UTF16_BigEndian},

28 { "utf16platformendian", UCNV_UTF16_LittleEndian },	28 { "utf16platformendian", UCNV_UTF16_LittleEndian },

29 #endif	29 #endif

30 -#if !UCONFIG_ONLY_HTML_CONVERSION	30 -#if !UCONFIG_ONLY_HTML_CONVERSION

31 { "utf32", UCNV_UTF32 },	31 { "utf32", UCNV_UTF32 },

32 { "utf32be", UCNV_UTF32_BigEndian },	32 { "utf32be", UCNV_UTF32_BigEndian },

33 { "utf32le", UCNV_UTF32_LittleEndian },	33 { "utf32le", UCNV_UTF32_LittleEndian },

34 @@ -179,7 +174,6 @@ static struct {	34 @@ -181,7 +176,6 @@ static struct {

35 { "utf32oppositeendian", UCNV_UTF32_BigEndian },	35 { "utf32oppositeendian", UCNV_UTF32_BigEndian },

36 { "utf32platformendian", UCNV_UTF32_LittleEndian },	36 { "utf32platformendian", UCNV_UTF32_LittleEndian },

37 #endif	37 #endif

38 -#endif	38 -#endif

39 #if !UCONFIG_ONLY_HTML_CONVERSION	39 #if !UCONFIG_ONLY_HTML_CONVERSION

40 { "utf7", UCNV_UTF7 },	40 { "utf7", UCNV_UTF7 },

41 #endif	41 #endif

42 diff --git a/source/common/ucnv_u32.c b/source/common/ucnv_u32.c	42 diff --git a/source/common/ucnv_u32.c b/source/common/ucnv_u32.c

43 index b6804ca..9bee9a4 100644	43 index b0a0fe2..5a4d6fc 100644

44 --- a/source/common/ucnv_u32.c	44 --- a/source/common/ucnv_u32.c

45 +++ b/source/common/ucnv_u32.c	45 +++ b/source/common/ucnv_u32.c

46 @@ -16,7 +16,7 @@	46 @@ -18,7 +18,7 @@

47	47

48 #include "unicode/utypes.h"	48 #include "unicode/utypes.h"

49	49

50 -#if !UCONFIG_NO_CONVERSION && !UCONFIG_ONLY_HTML_CONVERSION	50 -#if !UCONFIG_NO_CONVERSION && !UCONFIG_ONLY_HTML_CONVERSION

51 +#if !UCONFIG_NO_CONVERSION	51 +#if !UCONFIG_NO_CONVERSION

52	52

53 #include "unicode/ucnv.h"	53 #include "unicode/ucnv.h"

54 #include "unicode/utf.h"	54 #include "unicode/utf.h"

OLD	NEW

« no previous file with comments | « patches/utext.patch ('k') | patches/vscomp.patch » ('j') | no next file with comments »