Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 363390 IS_LOW_SURROGATE conflicts with winnls.h

Browse Source 
r=darin


git-svn-id: svn://10.0.0.236/trunk@217292 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
timeless%mozdev.org
2006-12-21 07:03:23 +00:00
parent 3c5c6820cf
commit 3ea4e560e3
34 changed files with 108 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mozilla/content/base/src/nsHTMLContentSerializer.cpp
View File

@@ -963,9 +963,9 @@ nsHTMLContentSerializer::AppendToString(const nsAString& aStr,
else if (val > 127 &&
mFlags & nsIDocumentEncoder::OutputEncodeW3CEntities &&
mEntityConverter) {
if (IS_HIGH_SURROGATE(val) &&
if (NS_IS_HIGH_SURROGATE(val) &&
c + 1 < fragmentEnd &&
IS_LOW_SURROGATE(*(c + 1))) {
NS_IS_LOW_SURROGATE(*(c + 1))) {
PRUint32 valUTF32 = SURROGATE_TO_UCS4(val, *(++c));
if (NS_SUCCEEDED(mEntityConverter->ConvertUTF32ToEntity(valUTF32,
nsIEntityConverter::entityW3C, &fullEntityText))) {