|
Line 0
Link Here
|
|
|
1 |
--- common/putil.cpp.orig 2016-10-19 17:20:56 UTC |
| 2 |
+++ common/putil.cpp |
| 3 |
@@ -1789,7 +1789,7 @@ remapPlatformDependentCodepage(const cha |
| 4 |
*/ |
| 5 |
name = "ISO-8859-1"; |
| 6 |
} |
| 7 |
-#elif U_PLATFORM_IS_DARWIN_BASED |
| 8 |
+#elif U_PLATFORM_IS_DARWIN_BASED || U_PLATFORM == U_PF_BSD |
| 9 |
if (locale == NULL && *name == 0) { |
| 10 |
/* |
| 11 |
No locale was specified, and an empty name was passed in. |
| 12 |
@@ -1808,11 +1808,6 @@ remapPlatformDependentCodepage(const cha |
| 13 |
*/ |
| 14 |
name = "UTF-8"; |
| 15 |
} |
| 16 |
-#elif U_PLATFORM == U_PF_BSD |
| 17 |
- if (uprv_strcmp(name, "CP949") == 0) { |
| 18 |
- /* Remap CP949 to a similar codepage to avoid issues with backslash and won symbol. */ |
| 19 |
- name = "EUC-KR"; |
| 20 |
- } |
| 21 |
#elif U_PLATFORM == U_PF_HPUX |
| 22 |
if (locale != NULL && uprv_strcmp(locale, "zh_HK") == 0 && uprv_strcmp(name, "big5") == 0) { |
| 23 |
/* HP decided to extend big5 as hkbig5 even though it's not compatible :-( */ |
| 24 |
@@ -1942,7 +1937,7 @@ int_getDefaultCodepage() |
| 25 |
nl_langinfo may use the same buffer as setlocale. */ |
| 26 |
{ |
| 27 |
const char *codeset = nl_langinfo(U_NL_LANGINFO_CODESET); |
| 28 |
-#if U_PLATFORM_IS_DARWIN_BASED || U_PLATFORM_IS_LINUX_BASED |
| 29 |
+#if U_PLATFORM_IS_DARWIN_BASED || U_PLATFORM_IS_LINUX_BASED || U_PLATFORM == U_PF_BSD |
| 30 |
/* |
| 31 |
* On Linux and MacOSX, ensure that default codepage for non C/POSIX locale is UTF-8 |
| 32 |
* instead of ASCII. |