Update ICU to 54.1 step 1

source/common/locmap.c

 /*
  **********************************************************************
  *   Copyright (C) 1996-2013, International Business Machines
  *   Corporation and others.  All Rights Reserved.
  **********************************************************************
  *
  * Provides functionality for mapping between
  * LCID and Posix IDs or ICU locale to codepage
  *
  * Note: All classes and code in this file are
@@ skipping 11 matching lines @@
  *                          MAX_ID_LENGTH.
  * 04/23/99     stephen     Added C wrapper for convertToPosix.
  * 09/18/00     george      Removed the memory leaks.
  * 08/23/01     george      Convert to C
  */
 
 #include "locmap.h"
 #include "cstring.h"
 #include "cmemory.h"
 
-/**
- * Chromium has its own implementation to determine the default locale that uses
- * Windows locale API where available and falls back to the old API at run-time.
- */
-#if 0
 #if U_PLATFORM == U_PF_WINDOWS && defined(_MSC_VER) && (_MSC_VER >= 1500)
 /*
  * TODO: It seems like we should widen this to
  * either U_PLATFORM_USES_ONLY_WIN32_API (includes MinGW)
  * or U_PLATFORM_HAS_WIN32_API (includes MinGW and Cygwin)
  * but those use gcc and won't have defined(_MSC_VER).
  * We might need to #include some Windows header and test for some version macro from there.
  * Or call some Windows function and see what it returns.
  */
 #define USE_WINDOWS_LOCALE_API
 #endif
-#endif
 
 #ifdef USE_WINDOWS_LOCALE_API
 #include <windows.h>
 #include <winnls.h>
 #endif
 
 /*
  * Note:
  * The mapping from Win32 locale ID numbers to POSIX locale strings should
  * be the faster one.
@@ skipping 234 matching lines @@
     {0x080a, "es_MX"},
     {0x4c0a, "es_NI"},
     {0x180a, "es_PA"},
     {0x280a, "es_PE"},
     {0x500a, "es_PR"},
     {0x3c0a, "es_PY"},
     {0x440a, "es_SV"},
     {0x540a, "es_US"},
     {0x380a, "es_UY"},
     {0x200a, "es_VE"},
-    {0xe40a, "es_419"},
+    {0x580a, "es_419"},
     {0x040a, "es_ES@collation=traditional"},
     {0x040a, "es@collation=traditional"}
 };
 
 ILCID_POSIX_ELEMENT_ARRAY(0x0425, et, et_EE)
 ILCID_POSIX_ELEMENT_ARRAY(0x042d, eu, eu_ES)
 
 /* ISO-639 doesn't distinguish between Persian and Dari.*/
 ILCID_POSIX_SUBTABLE(fa) {
     {0x29,   "fa"},
@@ skipping 147 matching lines @@
 ILCID_POSIX_ELEMENT_ARRAY(0x0481, mi, mi_NZ)
 ILCID_POSIX_ELEMENT_ARRAY(0x042f, mk, mk_MK)
 ILCID_POSIX_ELEMENT_ARRAY(0x044c, ml, ml_IN)
 
 ILCID_POSIX_SUBTABLE(mn) {
     {0x50,   "mn"},
     {0x0450, "mn_MN"},
     {0x7c50, "mn_Mong"},
     {0x0850, "mn_Mong_CN"},
     {0x0850, "mn_CN"},
-    {0x7850, "mn_Cyrl"}
+    {0x7850, "mn_Cyrl"},
+    {0x0c50, "mn_Mong_MN"}
 };
 
 ILCID_POSIX_ELEMENT_ARRAY(0x0458, mni,mni_IN)
 ILCID_POSIX_ELEMENT_ARRAY(0x047c, moh,moh_CA)
 ILCID_POSIX_ELEMENT_ARRAY(0x044e, mr, mr_IN)
 
 ILCID_POSIX_SUBTABLE(ms) {
     {0x3e,   "ms"},
     {0x083e, "ms_BN"},   /* Brunei Darussalam*/
     {0x043e, "ms_MY"}    /* Malaysia*/
@@ skipping 652 matching lines @@
     if (fallbackValue != (uint32_t)-1) {
         *status = U_USING_FALLBACK_WARNING;
         return fallbackValue;
     }
 
     /* no match found */
     *status = U_ILLEGAL_ARGUMENT_ERROR;
     return 0;   /* return international (root) */
 }