| OLD | NEW |
| 1 /* | 1 /* |
| 2 ********************************************************************** | 2 ********************************************************************** |
| 3 * Copyright (C) 1996-2014, International Business Machines | 3 * Copyright (C) 1996-2014, International Business Machines |
| 4 * Corporation and others. All Rights Reserved. | 4 * Corporation and others. All Rights Reserved. |
| 5 ********************************************************************** | 5 ********************************************************************** |
| 6 * | 6 * |
| 7 * Provides functionality for mapping between | 7 * Provides functionality for mapping between |
| 8 * LCID and Posix IDs or ICU locale to codepage | 8 * LCID and Posix IDs or ICU locale to codepage |
| 9 * | 9 * |
| 10 * Note: All classes and code in this file are | 10 * Note: All classes and code in this file are |
| (...skipping 11 matching lines...) Expand all Loading... |
| 22 * MAX_ID_LENGTH. | 22 * MAX_ID_LENGTH. |
| 23 * 04/23/99 stephen Added C wrapper for convertToPosix. | 23 * 04/23/99 stephen Added C wrapper for convertToPosix. |
| 24 * 09/18/00 george Removed the memory leaks. | 24 * 09/18/00 george Removed the memory leaks. |
| 25 * 08/23/01 george Convert to C | 25 * 08/23/01 george Convert to C |
| 26 */ | 26 */ |
| 27 | 27 |
| 28 #include "locmap.h" | 28 #include "locmap.h" |
| 29 #include "cstring.h" | 29 #include "cstring.h" |
| 30 #include "cmemory.h" | 30 #include "cmemory.h" |
| 31 | 31 |
| 32 #if 0 |
| 32 #if U_PLATFORM == U_PF_WINDOWS && defined(_MSC_VER) && (_MSC_VER >= 1500) | 33 #if U_PLATFORM == U_PF_WINDOWS && defined(_MSC_VER) && (_MSC_VER >= 1500) |
| 33 /* | 34 /* |
| 34 * TODO: It seems like we should widen this to | 35 * TODO: It seems like we should widen this to |
| 35 * either U_PLATFORM_USES_ONLY_WIN32_API (includes MinGW) | 36 * either U_PLATFORM_USES_ONLY_WIN32_API (includes MinGW) |
| 36 * or U_PLATFORM_HAS_WIN32_API (includes MinGW and Cygwin) | 37 * or U_PLATFORM_HAS_WIN32_API (includes MinGW and Cygwin) |
| 37 * but those use gcc and won't have defined(_MSC_VER). | 38 * but those use gcc and won't have defined(_MSC_VER). |
| 38 * We might need to #include some Windows header and test for some version macro
from there. | 39 * We might need to #include some Windows header and test for some version macro
from there. |
| 39 * Or call some Windows function and see what it returns. | 40 * Or call some Windows function and see what it returns. |
| 40 */ | 41 */ |
| 41 #define USE_WINDOWS_LOCALE_API | 42 #define USE_WINDOWS_LOCALE_API |
| 42 #endif | 43 #endif |
| 44 #endif |
| 43 | 45 |
| 44 #ifdef USE_WINDOWS_LOCALE_API | 46 #ifdef USE_WINDOWS_LOCALE_API |
| 45 #include <windows.h> | 47 #include <windows.h> |
| 46 #include <winnls.h> | 48 #include <winnls.h> |
| 47 #endif | 49 #endif |
| 48 | 50 |
| 49 /* | 51 /* |
| 50 * Note: | 52 * Note: |
| 51 * The mapping from Win32 locale ID numbers to POSIX locale strings should | 53 * The mapping from Win32 locale ID numbers to POSIX locale strings should |
| 52 * be the faster one. | 54 * be the faster one. |
| (...skipping 1073 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1126 if (fallbackValue != (uint32_t)-1) { | 1128 if (fallbackValue != (uint32_t)-1) { |
| 1127 *status = U_USING_FALLBACK_WARNING; | 1129 *status = U_USING_FALLBACK_WARNING; |
| 1128 return fallbackValue; | 1130 return fallbackValue; |
| 1129 } | 1131 } |
| 1130 | 1132 |
| 1131 /* no match found */ | 1133 /* no match found */ |
| 1132 *status = U_ILLEGAL_ARGUMENT_ERROR; | 1134 *status = U_ILLEGAL_ARGUMENT_ERROR; |
| 1133 return 0; /* return international (root) */ | 1135 return 0; /* return international (root) */ |
| 1134 } | 1136 } |
| 1135 | 1137 |
| OLD | NEW |