Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 11:25:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Attempt to fix OS2 bustage caused by autoconf test that changes the definition of |PRUnichar| from |PRUint16| to |wchar_t| on platforms where |sizeof(wchar_t)| is 2.

Browse Source
This commit is contained in:
dbaron%fas.harvard.edu 2000-12-23 19:00:35 +00:00
parent 1dd0ae7444
commit 9a4447d4bb
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
intl/locale/src/os2/nsCollationOS2.cpp
View File

@ -148,7 +148,7 @@ nsresult nsCollationOS2::Initialize(nsILocale *locale)
UniStrncpy((UniChar *)mappedCharset, pmCodepage, cpLen);
UniFreeMem(pmCodepage);
UniFreeLocaleObject(locObj);
PRUint32 mpLen = UniStrlen(mappedCharset);
PRUint32 mpLen = UniStrlen(NS_REINTERPRET_CAST(const UniChar *, mappedCharset));
if (NS_SUCCEEDED(ret) && mappedCharset) {
mCharset.Assign((PRUnichar*)mappedCharset, mpLen);
@ -175,7 +175,7 @@ nsresult nsCollationOS2::GetSortKeyLen(const nsCollationStrength strength,
int ret = UniCreateLocaleObject(UNI_UCS_STRING_POINTER, (UniChar *)L"", &locObj);
if (ret != ULS_SUCCESS)
return NS_ERROR_FAILURE;
int uLen = UniStrxfrm(locObj, NULL, stringNormalized.GetUnicode(), 0);
int uLen = UniStrxfrm(locObj, NULL, NS_REINTERPRET_CAST(const UniChar *, stringNormalized.GetUnicode()), 0);
UniFreeLocaleObject(locObj);
*outLen = (uLen < 1) ? 0 : (PRUint32)uLen;
@ -198,8 +198,8 @@ nsresult nsCollationOS2::CreateRawSortKey(const nsCollationStrength strength,
if (ret != ULS_SUCCESS)
return NS_ERROR_FAILURE;
int length = UniStrlen(stringNormalized.GetUnicode());
int uLen = UniStrxfrm(locObj, (UniChar*)key, stringNormalized.GetUnicode(), length);
int length = UniStrlen(NS_REINTERPRET_CAST(const UniChar *,stringNormalized.GetUnicode()));
int uLen = UniStrxfrm(locObj, (UniChar*)key, NS_REINTERPRET_CAST(const UniChar *,stringNormalized.GetUnicode()), length);
*outLen = (uLen < 1) ? 0 : (PRUint32)uLen;
UniFreeLocaleObject(locObj);