From b16201f0a9020d3d3595170d581eddcc6fbc93ff Mon Sep 17 00:00:00 2001 From: "jshin%mailaps.org" Date: Thu, 30 Oct 2003 06:52:39 +0000 Subject: [PATCH] bug 195093 : fix os2 bustage --- intl/locale/src/os2/nsOS2Locale.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/intl/locale/src/os2/nsOS2Locale.cpp b/intl/locale/src/os2/nsOS2Locale.cpp index 87604b616db..5fc734e4b91 100644 --- a/intl/locale/src/os2/nsOS2Locale.cpp +++ b/intl/locale/src/os2/nsOS2Locale.cpp @@ -62,7 +62,6 @@ nsOS2Locale::GetPlatformLocale(PRUnichar* os2Locale, size_t length) { LocaleObject locObj = NULL; - int result = 0; UniChar *localeName = NULL; int res = UniCreateLocaleObject(UNI_UCS_STRING_POINTER, (UniChar *)L"", &locObj); @@ -95,7 +94,8 @@ nsOS2Locale::GetXPLocale(const char* os2Locale, nsAString& locale) } if (!ParseLocaleString(os2Locale,lang_code,country_code,extra,'_')) { // * locale = "x-user-defined"; - CopyASCIItoUTF16(os2Locale, locale); // use os2 if parse failed + // use os2 if parse failed + CopyASCIItoUTF16(nsDependentCString(os2Locale), locale); return NS_OK; } @@ -116,7 +116,7 @@ nsOS2Locale::GetXPLocale(const char* os2Locale, nsAString& locale) } } - CopyASCIItoUTF16(os2_locale, locale); + CopyASCIItoUTF16(nsDependentCString(os2_locale), locale); return NS_OK; }