source/common/ucnv_bld.cpp - Issue 2442923002: ICU update to 58 part 2

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: source/common/ucnv_bld.cpp

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

Patch Set: apply more patches and updates; almost ready to roll Created 4 years, 2 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 side-by-side diff with in-line comments

Download patch

Index: source/common/ucnv_bld.cpp

diff --git a/source/common/ucnv_bld.cpp b/source/common/ucnv_bld.cpp

index 078f293ea17c095143e48cd6780a84915b749307..a8c41cc7df1196a5d7ac711ddf5bbf0e86972667 100644

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

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

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

&_Latin1Data,

&_UTF8Data, &_UTF16BEData, &_UTF16LEData,

-#if UCONFIG_ONLY_HTML_CONVERSION

- NULL, NULL,

-#else

&_UTF32BEData, &_UTF32LEData,

-#endif

NULL,

#if UCONFIG_NO_LEGACY_CONVERSION

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

&_ASCIIData,

#if UCONFIG_ONLY_HTML_CONVERSION

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

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

#else

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

#endif

@@ -170,7 +166,6 @@ static struct {

{ "utf16oppositeendian", UCNV_UTF16_BigEndian},

{ "utf16platformendian", UCNV_UTF16_LittleEndian },

#endif

-#if !UCONFIG_ONLY_HTML_CONVERSION

{ "utf32", UCNV_UTF32 },

{ "utf32be", UCNV_UTF32_BigEndian },

{ "utf32le", UCNV_UTF32_LittleEndian },

@@ -181,7 +176,6 @@ static struct {

{ "utf32oppositeendian", UCNV_UTF32_BigEndian },

{ "utf32platformendian", UCNV_UTF32_LittleEndian },

#endif

-#endif

#if !UCONFIG_ONLY_HTML_CONVERSION

{ "utf7", UCNV_UTF7 },

#endif

« no previous file with comments | « source/common/ucmndata.h ('k') | source/common/ucnv_u32.c » ('j') | no next file with comments »