Update ICU to 54.1 step 1

source/common/unicode/uconfig.h

Index: source/common/unicode/uconfig.h
diff --git a/source/common/unicode/uconfig.h b/source/common/unicode/uconfig.h
index fce06207ab4652b11d1e1e679e620ae7c1686fd2..ed073b63ea6f93fab378f7906f635bb7eeccfacd 100644
--- a/source/common/unicode/uconfig.h
+++ b/source/common/unicode/uconfig.h
@@ -1,6 +1,6 @@
 /*  
 **********************************************************************
-*   Copyright (C) 2002-2013, International Business Machines
+*   Copyright (C) 2002-2014, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 **********************************************************************
 *   file name:  uconfig.h
@@ -185,7 +185,8 @@
 #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
@@ -245,6 +246,10 @@
 #   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.
@@ -265,14 +270,6 @@
 #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)
@@ -417,4 +414,17 @@
 #   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