icu local change part1

icu52/source/common/ucnv_bld.cpp

 /*
  ********************************************************************
  * COPYRIGHT:
  * Copyright (c) 1996-2013, International Business Machines Corporation and
  * others. All Rights Reserved.
  ********************************************************************
  *
  *  uconv_bld.cpp:
  *
  *  Defines functions that are used in the creation/initialization/deletion
@@ skipping 61 matching lines @@
     NULL, NULL, NULL, NULL, NULL, NULL,
     NULL, NULL, NULL, NULL, NULL, NULL,
     NULL,
 #else
     &_ISO2022Data,
     &_LMBCSData1,&_LMBCSData2, &_LMBCSData3, &_LMBCSData4, &_LMBCSData5, &_LMBCSData6,
     &_LMBCSData8,&_LMBCSData11,&_LMBCSData16,&_LMBCSData17,&_LMBCSData18,&_LMBCSData19,
     &_HZData,
 #endif
 
+#if UCONFIG_NO_NON_HTML5_CONVERSION
+    NULL,
+#else
     &_SCSUData,
+#endif
 
-#if UCONFIG_NO_LEGACY_CONVERSION
+
+#if UCONFIG_NO_LEGACY_CONVERSION || UCONFIG_NO_NON_HTML5_CONVERSION
     NULL,
 #else
     &_ISCIIData,
 #endif
 
     &_ASCIIData,
+#if UCONFIG_NO_NON_HTML5_CONVERSION
+    NULL, NULL, &_UTF16Data, &_UTF32Data, NULL, NULL,
+#else
     &_UTF7Data, &_Bocu1Data, &_UTF16Data, &_UTF32Data, &_CESU8Data, &_IMAPData,
+#endif
 
 #if UCONFIG_NO_LEGACY_CONVERSION
     NULL,
 #else
     &_CompoundTextData
 #endif
 };
 
 /* Please keep this in binary sorted order for getAlgorithmicTypeFromName.
    Also the name should be in lower case and all spaces, dashes and underscores
@@ skipping 1593 matching lines @@
         *pErrorCode=U_UNSUPPORTED_ERROR;
         return 0;
     }
 
     return headerSize+(int32_t)staticDataSize+size;
 }
 
 #endif /* #if !UCONFIG_NO_LEGACY_CONVERSION */
 
 #endif