icu local change part1

icu52/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 1075 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) */
 }