Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / icu / source / common / ucnv_cnv.h

diff --git a/src/third_party/icu/source/common/ucnv_cnv.h b/src/third_party/icu/source/common/ucnv_cnv.h
index cba24d0..beaebef 100644 (file)
--- a/src/third_party/icu/source/common/ucnv_cnv.h
+++ b/src/third_party/icu/source/common/ucnv_cnv.h
@@ -1,6 +1,6 @@
 /*
 **********************************************************************
-*   Copyright (C) 1999-2009, International Business Machines
+*   Copyright (C) 1999-2011, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 **********************************************************************
 *
@@ -56,6 +56,9 @@ typedef struct {
     const char *pkg, *name, *locale;
 } UConverterLoadArgs;
 
+#define UCNV_LOAD_ARGS_INITIALIZER \
+    { (int32_t)sizeof(UConverterLoadArgs), 0, FALSE, FALSE, 0, 0, NULL, NULL, NULL }
+
 typedef void (*UConverterLoad) (UConverterSharedData *sharedData,
                                 UConverterLoadArgs *pArgs,
                                 const uint8_t *raw, UErrorCode *pErrorCode);
@@ -256,8 +259,13 @@ extern const UConverterSharedData
     _ISO2022Data, 
     _LMBCSData1,_LMBCSData2, _LMBCSData3, _LMBCSData4, _LMBCSData5, _LMBCSData6,
     _LMBCSData8,_LMBCSData11,_LMBCSData16,_LMBCSData17,_LMBCSData18,_LMBCSData19,
+#if !UCONFIG_NO_NON_HTML5_CONVERSION
     _HZData,_ISCIIData, _SCSUData, _ASCIIData,
-    _UTF7Data, _Bocu1Data, _UTF16Data, _UTF32Data, _CESU8Data, _IMAPData;
+    _UTF7Data, _Bocu1Data, _UTF16Data, _UTF32Data, _CESU8Data, _IMAPData, _CompoundTextData;
+#else
+    _HZData, _ASCIIData,
+    _UTF16Data, _UTF32Data, _CompoundTextData;
+#endif
 
 U_CDECL_END