ICU-64232.0.1.tar.gz

[apple/icu.git] / icuSources / common / unicode / uconfig.h

diff --git a/icuSources/common/unicode/uconfig.h b/icuSources/common/unicode/uconfig.h
index 4c19cd50bd37779cb6ce124fbfa39521e3efd66e..284dee7eeb957d888053f9be921c8741ae79d0ca 100644 (file)
--- a/icuSources/common/unicode/uconfig.h
+++ b/icuSources/common/unicode/uconfig.h
@@ -183,7 +183,7 @@
  */
 #ifdef U_HAVE_LIB_SUFFIX
     /* Use the predefined value. */
  */
 #ifdef U_HAVE_LIB_SUFFIX
     /* Use the predefined value. */

-#elif defined(U_LIB_SUFFIX_C_NAME)
+#elif defined(U_LIB_SUFFIX_C_NAME) || defined(U_IN_DOXYGEN)

 #   define U_HAVE_LIB_SUFFIX 1
 #endif
 
 #   define U_HAVE_LIB_SUFFIX 1
 #endif
 


@@ -369,6 +369,18 @@
 #   define UCONFIG_MSGPAT_DEFAULT_APOSTROPHE_MODE UMSGPAT_APOS_DOUBLE_OPTIONAL
 #endif
 
 #   define UCONFIG_MSGPAT_DEFAULT_APOSTROPHE_MODE UMSGPAT_APOS_DOUBLE_OPTIONAL
 #endif
 

+/**
+ * \def UCONFIG_USE_WINDOWS_LCID_MAPPING_API
+ * On platforms where U_PLATFORM_HAS_WIN32_API is true, this switch determines
+ * if the Windows platform APIs are used for LCID<->Locale Name conversions.
+ * Otherwise, only the built-in ICU tables are used.
+ * 
+ * @internal ICU 64
+ */
+#ifndef UCONFIG_USE_WINDOWS_LCID_MAPPING_API
+#   define UCONFIG_USE_WINDOWS_LCID_MAPPING_API 1
+#endif
+

 /* i18n library switches ---------------------------------------------------- */
 
 /**
 /* i18n library switches ---------------------------------------------------- */
 
 /**


@@ -431,17 +443,6 @@
 #   define UCONFIG_HAVE_PARSEALLINPUT 1
 #endif
 
 #   define UCONFIG_HAVE_PARSEALLINPUT 1
 #endif
 

-
-/**
- * \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.
 /**
  * \def UCONFIG_NO_FILTERED_BREAK_ITERATION
  * This switch turns off filtered break iteration code.