Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1125)

Unified Diff: patches/utf32.patch

Issue 1664293002: Add back UTF-32 for now and fix a MSVC build issue (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/icu.git@master
Patch Set: Created 4 years, 10 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
« no previous file with comments | « README.chromium ('k') | patches/vscomp.patch » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: patches/utf32.patch
diff --git a/patches/utf32.patch b/patches/utf32.patch
new file mode 100644
index 0000000000000000000000000000000000000000..c97d8baa5b84c1d0a47c0d153dac6a0e9d1bac9e
--- /dev/null
+++ b/patches/utf32.patch
@@ -0,0 +1,54 @@
+diff --git a/source/common/ucnv_bld.cpp b/source/common/ucnv_bld.cpp
+index 3c6b0e3..77fd0e6 100644
+--- a/source/common/ucnv_bld.cpp
++++ b/source/common/ucnv_bld.cpp
+@@ -65,11 +65,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
+@@ -103,7 +99,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
+@@ -168,7 +164,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 },
+@@ -179,7 +174,6 @@ static struct {
+ { "utf32oppositeendian", UCNV_UTF32_BigEndian },
+ { "utf32platformendian", UCNV_UTF32_LittleEndian },
+ #endif
+-#endif
+ #if !UCONFIG_ONLY_HTML_CONVERSION
+ { "utf7", UCNV_UTF7 },
+ #endif
+diff --git a/source/common/ucnv_u32.c b/source/common/ucnv_u32.c
+index b6804ca..9bee9a4 100644
+--- a/source/common/ucnv_u32.c
++++ b/source/common/ucnv_u32.c
+@@ -16,7 +16,7 @@
+
+ #include "unicode/utypes.h"
+
+-#if !UCONFIG_NO_CONVERSION && !UCONFIG_ONLY_HTML_CONVERSION
++#if !UCONFIG_NO_CONVERSION
+
+ #include "unicode/ucnv.h"
+ #include "unicode/utf.h"
« no previous file with comments | « README.chromium ('k') | patches/vscomp.patch » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698