Update ICU to 54.1 step 1

source/common/unicode/uconfig.h

 /*  
 **********************************************************************
-*   Copyright (C) 2002-2013, International Business Machines
+*   Copyright (C) 2002-2014, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 **********************************************************************
 *   file name:  uconfig.h
 *   encoding:   US-ASCII
 *   tab size:   8 (not used)
 *   indentation:4
 *
 *   created on: 2002sep19
 *   created by: Markus W. Scherer
 */
@@ skipping 164 matching lines @@
 #endif
 
 /**
  * \def U_LIB_SUFFIX_C_NAME_STRING
  * Defines the library suffix as a string with C syntax.
  * @internal
  */
 #ifdef U_LIB_SUFFIX_C_NAME_STRING
     /* Use the predefined value. */
 #elif defined(U_LIB_SUFFIX_C_NAME)
-#   define U_LIB_SUFFIX_C_NAME_STRING #U_LIB_SUFFIX_C_NAME
+#   define CONVERT_TO_STRING(s) #s
+#   define U_LIB_SUFFIX_C_NAME_STRING CONVERT_TO_STRING(U_LIB_SUFFIX_C_NAME)
 #else
 #   define U_LIB_SUFFIX_C_NAME_STRING ""
 #endif
 
 /* common/i18n library switches --------------------------------------------- */
 
 /**
  * \def UCONFIG_ONLY_COLLATION
  * This switch turns off modules that are not needed for collation.
  *
@@ skipping 39 matching lines @@
  *
  * File access cannot be turned off for the icuio library or for the ICU
  * test suites and ICU tools.
  *
  * @stable ICU 3.6
  */
 #ifndef UCONFIG_NO_FILE_IO
 #   define UCONFIG_NO_FILE_IO 0
 #endif
 
+#if UCONFIG_NO_FILE_IO && defined(U_TIMEZONE_FILES_DIR) 
+#   error Contradictory file io switches in uconfig.h.
+#endif
+
 /**
  * \def UCONFIG_NO_CONVERSION
  * ICU will not completely build with this switch turned on.
  * This switch turns off all converters.
  *
  * You may want to use this together with U_CHARSET_IS_UTF8 defined to 1
  * in utypes.h if char* strings in your environment are always in UTF-8.
  *
  * @stable ICU 3.2
  * @see U_CHARSET_IS_UTF8
  */
 #ifndef UCONFIG_NO_CONVERSION
 #   define UCONFIG_NO_CONVERSION 0
 #endif
 
 #if UCONFIG_NO_CONVERSION
 #   define UCONFIG_NO_LEGACY_CONVERSION 1
 #endif
 
 /**
- * This switch turns off all the converters NOT listed in
- * the encoding standard : http://encoding.spec.whatwg.org
- */
-#ifndef UCONFIG_NO_NON_HTML5_CONVERSION
-#define UCONFIG_NO_NON_HTML5_CONVERSION 0
-#endif
-
-/**
  * \def UCONFIG_NO_LEGACY_CONVERSION
  * This switch turns off all converters except for
  * - Unicode charsets (UTF-7/8/16/32, CESU-8, SCSU, BOCU-1)
  * - US-ASCII
  * - ISO-8859-1
  *
  * Turning off legacy conversion is not possible on EBCDIC platforms
  * because they need ibm-37 or ibm-1047 default converters.
  *
  * @stable ICU 2.4
@@ skipping 124 matching lines @@
 /**
  * \def UCONFIG_FORMAT_FASTPATHS_49
  * This switch turns on other formatting fastpaths. Binary incompatible in object DecimalFormat and DecimalFormatSymbols
  *
  * @internal
  */
 #ifndef UCONFIG_FORMAT_FASTPATHS_49
 #   define UCONFIG_FORMAT_FASTPATHS_49 1
 #endif
 
+/**
+ * \def UCONFIG_NO_FILTERED_BREAK_ITERATION
+ * This switch turns off filtered break iteration code.
+ *
+ * @internal
+ */
+#ifndef UCONFIG_NO_FILTERED_BREAK_ITERATION
+#   define UCONFIG_NO_FILTERED_BREAK_ITERATION 0
+
+
+
 #endif
+
+#endif