? a
Index: mozilla/content/base/src/nsDocumentEncoder.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/base/src/nsDocumentEncoder.cpp,v
retrieving revision 1.117
diff -p -U 0 -r1.117 nsDocumentEncoder.cpp
--- mozilla/content/base/src/nsDocumentEncoder.cpp	19 Jul 2006 04:27:33 -0000	1.117
+++ mozilla/content/base/src/nsDocumentEncoder.cpp	13 Dec 2006 22:30:04 -0000
@@ -452,2 +452,2 @@ ConvertAndWrite(const nsAString& aString
-      if (IS_HIGH_SURROGATE(unicodeBuf[unicodeLength - 1]) && 
-          unicodeLength < startLength && IS_LOW_SURROGATE(unicodeBuf[unicodeLength]))  {
+      if (NS_IS_HIGH_SURROGATE(unicodeBuf[unicodeLength - 1]) && 
+          unicodeLength < startLength && NS_IS_LOW_SURROGATE(unicodeBuf[unicodeLength]))  {
Index: mozilla/content/base/src/nsHTMLContentSerializer.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/base/src/nsHTMLContentSerializer.cpp,v
retrieving revision 1.106
diff -p -U 0 -r1.106 nsHTMLContentSerializer.cpp
--- mozilla/content/base/src/nsHTMLContentSerializer.cpp	28 Nov 2006 04:01:45 -0000	1.106
+++ mozilla/content/base/src/nsHTMLContentSerializer.cpp	13 Dec 2006 22:30:04 -0000
@@ -966 +966 @@ nsHTMLContentSerializer::AppendToString(
-            if (IS_HIGH_SURROGATE(val) &&
+            if (NS_IS_HIGH_SURROGATE(val) &&
@@ -968 +968 @@ nsHTMLContentSerializer::AppendToString(
-                IS_LOW_SURROGATE(*(c + 1))) {
+                NS_IS_LOW_SURROGATE(*(c + 1))) {
Index: mozilla/content/base/src/nsTextFragment.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/base/src/nsTextFragment.cpp,v
retrieving revision 1.23
diff -p -U 0 -r1.23 nsTextFragment.cpp
--- mozilla/content/base/src/nsTextFragment.cpp	28 Oct 2006 01:22:53 -0000	1.23
+++ mozilla/content/base/src/nsTextFragment.cpp	13 Dec 2006 22:30:04 -0000
@@ -397 +397 @@ nsTextFragment::SetBidiFlag()
-      if (IS_HIGH_SURROGATE(ch1) &&
+      if (NS_IS_HIGH_SURROGATE(ch1) &&
@@ -399 +399 @@ nsTextFragment::SetBidiFlag()
-          IS_LOW_SURROGATE(*cp)) {
+          NS_IS_LOW_SURROGATE(*cp)) {
Index: mozilla/editor/libeditor/base/nsEditor.cpp
===================================================================
RCS file: /cvsroot/mozilla/editor/libeditor/base/nsEditor.cpp,v
retrieving revision 1.479
diff -p -U 0 -r1.479 nsEditor.cpp
--- mozilla/editor/libeditor/base/nsEditor.cpp	15 Nov 2006 06:37:53 -0000	1.479
+++ mozilla/editor/libeditor/base/nsEditor.cpp	13 Dec 2006 22:30:06 -0000
@@ -4888 +4888 @@ nsEditor::CreateTxnForDeleteCharacter(ns
-    if (IS_HIGH_SURROGATE(data[segOffset]) &&
+    if (NS_IS_HIGH_SURROGATE(data[segOffset]) &&
@@ -4890 +4890 @@ nsEditor::CreateTxnForDeleteCharacter(ns
-        IS_LOW_SURROGATE(data[segOffset+1])) {
+        NS_IS_LOW_SURROGATE(data[segOffset+1])) {
@@ -4896 +4896 @@ nsEditor::CreateTxnForDeleteCharacter(ns
-    if (IS_LOW_SURROGATE(data[segOffset]) &&
+    if (NS_IS_LOW_SURROGATE(data[segOffset]) &&
@@ -4898 +4898 @@ nsEditor::CreateTxnForDeleteCharacter(ns
-        IS_HIGH_SURROGATE(data[segOffset-1])) {
+        NS_IS_HIGH_SURROGATE(data[segOffset-1])) {
Index: mozilla/gfx/src/gtk/nsFontMetricsGTK.cpp
===================================================================
RCS file: /cvsroot/mozilla/gfx/src/gtk/nsFontMetricsGTK.cpp,v
retrieving revision 1.289
diff -p -U 0 -r1.289 nsFontMetricsGTK.cpp
--- mozilla/gfx/src/gtk/nsFontMetricsGTK.cpp	28 Aug 2006 20:12:30 -0000	1.289
+++ mozilla/gfx/src/gtk/nsFontMetricsGTK.cpp	13 Dec 2006 22:30:08 -0000
@@ -2082 +2082 @@ nsFontMetricsGTK::ResolveForwards(const 
-  if (IS_HIGH_SURROGATE(*currChar) && (currChar+1) < lastChar && IS_LOW_SURROGATE(*(currChar+1))) {
+  if (NS_IS_HIGH_SURROGATE(*currChar) && (currChar+1) < lastChar && NS_IS_LOW_SURROGATE(*(currChar+1))) {
@@ -2103 +2103 @@ nsFontMetricsGTK::ResolveForwards(const 
-    if (IS_HIGH_SURROGATE(*currChar) && (currChar+1) < lastChar && IS_LOW_SURROGATE(*(currChar+1))) {
+    if (NS_IS_HIGH_SURROGATE(*currChar) && (currChar+1) < lastChar && NS_IS_LOW_SURROGATE(*(currChar+1))) {
@@ -2116 +2116 @@ nsFontMetricsGTK::ResolveForwards(const 
-    if (IS_HIGH_SURROGATE(*currChar) && (currChar+1) < lastChar && IS_LOW_SURROGATE(*(currChar+1))) {
+    if (NS_IS_HIGH_SURROGATE(*currChar) && (currChar+1) < lastChar && NS_IS_LOW_SURROGATE(*(currChar+1))) {
@@ -3679 +3679 @@ nsFontMetricsGTK::GetWidth  (const PRUni
-        if(i < aLength-1 && IS_HIGH_SURROGATE(c) && IS_LOW_SURROGATE(aString[i+1])) {
+        if(i < aLength-1 && NS_IS_HIGH_SURROGATE(c) && NS_IS_LOW_SURROGATE(aString[i+1])) {
@@ -3838 +3838 @@ nsFontMetricsGTK::DrawString(const PRUni
-        if(i < aLength-1 && IS_HIGH_SURROGATE(c) && IS_LOW_SURROGATE(aString[i+1])) {
+        if(i < aLength-1 && NS_IS_HIGH_SURROGATE(c) && NS_IS_LOW_SURROGATE(aString[i+1])) {
@@ -4015 +4015 @@ nsFontMetricsGTK::GetBoundingMetrics(con
-        if(i < aLength-1 && IS_HIGH_SURROGATE(c) && IS_LOW_SURROGATE(aString[i+1])) {
+        if(i < aLength-1 && NS_IS_HIGH_SURROGATE(c) && NS_IS_LOW_SURROGATE(aString[i+1])) {
@@ -4109 +4109 @@ nsFontMetricsGTK::GetTextDimensions (con
-        if(i < aLength-1 && IS_HIGH_SURROGATE(c) && IS_LOW_SURROGATE(aString[i+1])) {
+        if(i < aLength-1 && NS_IS_HIGH_SURROGATE(c) && NS_IS_LOW_SURROGATE(aString[i+1])) {
Index: mozilla/gfx/src/gtk/nsFontMetricsPango.cpp
===================================================================
RCS file: /cvsroot/mozilla/gfx/src/gtk/nsFontMetricsPango.cpp,v
retrieving revision 1.25
diff -p -U 0 -r1.25 nsFontMetricsPango.cpp
--- mozilla/gfx/src/gtk/nsFontMetricsPango.cpp	11 Sep 2006 23:02:36 -0000	1.25
+++ mozilla/gfx/src/gtk/nsFontMetricsPango.cpp	13 Dec 2006 22:30:09 -0000
@@ -648 +648 @@ nsFontMetricsPango::GetTextDimensions(co
-        if (IS_HIGH_SURROGATE(aString[curOffset]))
+        if (NS_IS_HIGH_SURROGATE(aString[curOffset]))
@@ -928 +928 @@ nsFontMetricsPango::GetClusterInfo(const
-        if (IS_HIGH_SURROGATE(aText[pos])) {
+        if (NS_IS_HIGH_SURROGATE(aText[pos])) {
@@ -994 +994 @@ nsFontMetricsPango::GetPosition(const PR
-        if (IS_HIGH_SURROGATE(aText[curOffset]))
+        if (NS_IS_HIGH_SURROGATE(aText[curOffset]))
@@ -1004 +1004 @@ nsFontMetricsPango::GetPosition(const PR
-        if (retval < (PRInt32)aLength && IS_HIGH_SURROGATE(aText[retval]))
+        if (retval < (PRInt32)aLength && NS_IS_HIGH_SURROGATE(aText[retval]))
@@ -1054 +1054 @@ nsFontMetricsPango::GetRangeWidth(const 
-        if (IS_HIGH_SURROGATE(aText[curOffset]))
+        if (NS_IS_HIGH_SURROGATE(aText[curOffset]))
@@ -1319 +1319 @@ nsFontMetricsPango::DrawStringSlowly(con
-            if (IS_HIGH_SURROGATE(aOrigString[curOffset]))
+            if (NS_IS_HIGH_SURROGATE(aOrigString[curOffset]))
Index: mozilla/gfx/src/gtk/nsFontMetricsXft.cpp
===================================================================
RCS file: /cvsroot/mozilla/gfx/src/gtk/nsFontMetricsXft.cpp,v
retrieving revision 1.73
diff -p -U 0 -r1.73 nsFontMetricsXft.cpp
--- mozilla/gfx/src/gtk/nsFontMetricsXft.cpp	26 Jun 2006 22:18:20 -0000	1.73
+++ mozilla/gfx/src/gtk/nsFontMetricsXft.cpp	13 Dec 2006 22:30:09 -0000
@@ -2406,2 +2406,2 @@ ConvertUnicharToUCS4(const PRUnichar *aS
-        else if (IS_HIGH_SURROGATE(aString[i])) {
-            if (i + 1 < aLength && IS_LOW_SURROGATE(aString[i+1])) {
+        else if (NS_IS_HIGH_SURROGATE(aString[i])) {
+            if (i + 1 < aLength && NS_IS_LOW_SURROGATE(aString[i+1])) {
@@ -2415 +2415 @@ ConvertUnicharToUCS4(const PRUnichar *aS
-        else if (IS_LOW_SURROGATE(aString[i])) { // Unpaired low surrogate?
+        else if (NS_IS_LOW_SURROGATE(aString[i])) { // Unpaired low surrogate?
Index: mozilla/gfx/src/mac/nsUnicodeRenderingToolkit.cpp
===================================================================
RCS file: /cvsroot/mozilla/gfx/src/mac/nsUnicodeRenderingToolkit.cpp,v
retrieving revision 1.50
diff -p -U 0 -r1.50 nsUnicodeRenderingToolkit.cpp
--- mozilla/gfx/src/mac/nsUnicodeRenderingToolkit.cpp	28 Aug 2006 20:12:31 -0000	1.50
+++ mozilla/gfx/src/mac/nsUnicodeRenderingToolkit.cpp	13 Dec 2006 22:30:10 -0000
@@ -1304 +1304 @@ nsUnicodeRenderingToolkit::GetTextSegmen
-      if (IS_HIGH_SURROGATE(*aString) && 
+      if (NS_IS_HIGH_SURROGATE(*aString) && 
@@ -1306 +1306 @@ nsUnicodeRenderingToolkit::GetTextSegmen
-          IS_LOW_SURROGATE(*(aString+1)))
+          NS_IS_LOW_SURROGATE(*(aString+1)))
@@ -1489 +1489 @@ nsUnicodeRenderingToolkit::GetTextSegmen
-      if (IS_HIGH_SURROGATE(*aString) && 
+      if (NS_IS_HIGH_SURROGATE(*aString) && 
@@ -1491 +1491 @@ nsUnicodeRenderingToolkit::GetTextSegmen
-          IS_LOW_SURROGATE(*(aString+1)) )
+          NS_IS_LOW_SURROGATE(*(aString+1)) )
@@ -1629 +1629 @@ nsresult nsUnicodeRenderingToolkit :: Dr
-      if (IS_HIGH_SURROGATE(*aString) && 
+      if (NS_IS_HIGH_SURROGATE(*aString) && 
@@ -1631 +1631 @@ nsresult nsUnicodeRenderingToolkit :: Dr
-          IS_LOW_SURROGATE(*(aString+1)) )
+          NS_IS_LOW_SURROGATE(*(aString+1)) )
Index: mozilla/gfx/src/os2/nsFontMetricsOS2.cpp
===================================================================
RCS file: /cvsroot/mozilla/gfx/src/os2/nsFontMetricsOS2.cpp,v
retrieving revision 1.130
diff -p -U 0 -r1.130 nsFontMetricsOS2.cpp
--- mozilla/gfx/src/os2/nsFontMetricsOS2.cpp	3 Jun 2006 23:38:54 -0000	1.130
+++ mozilla/gfx/src/os2/nsFontMetricsOS2.cpp	13 Dec 2006 22:30:11 -0000
@@ -2197 +2197 @@ nsFontMetricsOS2FT::ResolveForwards(HPS 
-  if (IS_HIGH_SURROGATE(*currChar) && (currChar+1) < lastChar && IS_LOW_SURROGATE(*(currChar+1))) {
+  if (NS_IS_HIGH_SURROGATE(*currChar) && (currChar+1) < lastChar && NS_IS_LOW_SURROGATE(*(currChar+1))) {
@@ -2218 +2218 @@ nsFontMetricsOS2FT::ResolveForwards(HPS 
-    if (IS_HIGH_SURROGATE(*currChar) && (currChar+1) < lastChar && IS_LOW_SURROGATE(*(currChar+1))) {
+    if (NS_IS_HIGH_SURROGATE(*currChar) && (currChar+1) < lastChar && NS_IS_LOW_SURROGATE(*(currChar+1))) {
@@ -2231 +2231 @@ nsFontMetricsOS2FT::ResolveForwards(HPS 
-    if (IS_HIGH_SURROGATE(*currChar) && (currChar+1) < lastChar && IS_LOW_SURROGATE(*(currChar+1))) {
+    if (NS_IS_HIGH_SURROGATE(*currChar) && (currChar+1) < lastChar && NS_IS_LOW_SURROGATE(*(currChar+1))) {
@@ -2281 +2281 @@ nsFontMetricsOS2FT::ResolveBackwards(HPS
-  if (IS_LOW_SURROGATE(*currChar) && (currChar-1) > lastChar && IS_HIGH_SURROGATE(*(currChar-1))) {
+  if (NS_IS_LOW_SURROGATE(*currChar) && (currChar-1) > lastChar && NS_IS_HIGH_SURROGATE(*(currChar-1))) {
@@ -2302 +2302 @@ nsFontMetricsOS2FT::ResolveBackwards(HPS
-    if (IS_LOW_SURROGATE(*currChar) && (currChar-1) > lastChar && IS_HIGH_SURROGATE(*(currChar-1))) {
+    if (NS_IS_LOW_SURROGATE(*currChar) && (currChar-1) > lastChar && NS_IS_HIGH_SURROGATE(*(currChar-1))) {
@@ -2317 +2317 @@ nsFontMetricsOS2FT::ResolveBackwards(HPS
-    if (IS_LOW_SURROGATE(*currChar) && (currChar-1) > lastChar && IS_HIGH_SURROGATE(*(currChar-1))) {
+    if (NS_IS_LOW_SURROGATE(*currChar) && (currChar-1) > lastChar && NS_IS_HIGH_SURROGATE(*(currChar-1))) {
Index: mozilla/gfx/src/os2/nsRenderingContextOS2.cpp
===================================================================
RCS file: /cvsroot/mozilla/gfx/src/os2/nsRenderingContextOS2.cpp,v
retrieving revision 1.97
diff -p -U 0 -r1.97 nsRenderingContextOS2.cpp
--- mozilla/gfx/src/os2/nsRenderingContextOS2.cpp	17 Sep 2006 00:04:37 -0000	1.97
+++ mozilla/gfx/src/os2/nsRenderingContextOS2.cpp	13 Dec 2006 22:30:12 -0000
@@ -2043 +2043 @@ do_DrawString(const nsFontSwitch* aFontS
-      if (IS_HIGH_SURROGATE(*str) && 
+      if (NS_IS_HIGH_SURROGATE(*str) && 
@@ -2045 +2045 @@ do_DrawString(const nsFontSwitch* aFontS
-          IS_LOW_SURROGATE(*(str+1))) 
+          NS_IS_LOW_SURROGATE(*(str+1))) 
Index: mozilla/gfx/src/shared/nsRenderingContextImpl.cpp
===================================================================
RCS file: /cvsroot/mozilla/gfx/src/shared/nsRenderingContextImpl.cpp,v
retrieving revision 3.62
diff -p -U 0 -r3.62 nsRenderingContextImpl.cpp
--- mozilla/gfx/src/shared/nsRenderingContextImpl.cpp	7 Aug 2006 21:57:12 -0000	3.62
+++ mozilla/gfx/src/shared/nsRenderingContextImpl.cpp	13 Dec 2006 22:30:12 -0000
@@ -530 +530 @@ static PRInt32 FindSafeLength(nsRenderin
-         (IS_LOW_SURROGATE(aString[len]) || (clusterHint && !buffer[len]))) {
+         (NS_IS_LOW_SURROGATE(aString[len]) || (clusterHint && !buffer[len]))) {
Index: mozilla/gfx/src/windows/nsFontMetricsWin.cpp
===================================================================
RCS file: /cvsroot/mozilla/gfx/src/windows/nsFontMetricsWin.cpp,v
retrieving revision 3.248
diff -p -U 0 -r3.248 nsFontMetricsWin.cpp
--- mozilla/gfx/src/windows/nsFontMetricsWin.cpp	10 Sep 2006 19:15:08 -0000	3.248
+++ mozilla/gfx/src/windows/nsFontMetricsWin.cpp	13 Dec 2006 22:30:14 -0000
@@ -4031 +4031 @@ nsFontMetricsWin::ResolveForwards(HDC   
-  if (IS_HIGH_SURROGATE(*currChar) && (currChar+1) < lastChar && IS_LOW_SURROGATE(*(currChar+1))) {
+  if (NS_IS_HIGH_SURROGATE(*currChar) && (currChar+1) < lastChar && NS_IS_LOW_SURROGATE(*(currChar+1))) {
@@ -4057 +4057 @@ nsFontMetricsWin::ResolveForwards(HDC   
-    if (IS_HIGH_SURROGATE(*currChar) && (currChar+1) < lastChar && IS_LOW_SURROGATE(*(currChar+1))) {
+    if (NS_IS_HIGH_SURROGATE(*currChar) && (currChar+1) < lastChar && NS_IS_LOW_SURROGATE(*(currChar+1))) {
@@ -4070 +4070 @@ nsFontMetricsWin::ResolveForwards(HDC   
-    if (IS_HIGH_SURROGATE(*currChar) && (currChar+1) < lastChar && IS_LOW_SURROGATE(*(currChar+1))) {
+    if (NS_IS_HIGH_SURROGATE(*currChar) && (currChar+1) < lastChar && NS_IS_LOW_SURROGATE(*(currChar+1))) {
@@ -4120 +4120 @@ nsFontMetricsWin::ResolveBackwards(HDC  
-  if (IS_LOW_SURROGATE(*currChar) && (currChar-1) > lastChar && IS_HIGH_SURROGATE(*(currChar-1))) {
+  if (NS_IS_LOW_SURROGATE(*currChar) && (currChar-1) > lastChar && NS_IS_HIGH_SURROGATE(*(currChar-1))) {
@@ -4147 +4147 @@ nsFontMetricsWin::ResolveBackwards(HDC  
-    if (IS_LOW_SURROGATE(*currChar) && (currChar-1) > lastChar && IS_HIGH_SURROGATE(*(currChar-1))) {
+    if (NS_IS_LOW_SURROGATE(*currChar) && (currChar-1) > lastChar && NS_IS_HIGH_SURROGATE(*(currChar-1))) {
@@ -4162 +4162 @@ nsFontMetricsWin::ResolveBackwards(HDC  
-    if (IS_LOW_SURROGATE(*currChar) && (currChar-1) > lastChar && IS_HIGH_SURROGATE(*(currChar-1))) {
+    if (NS_IS_LOW_SURROGATE(*currChar) && (currChar-1) > lastChar && NS_IS_HIGH_SURROGATE(*(currChar-1))) {
@@ -4294,2 +4294,2 @@ VerifyFontHasGlyph(nsFontWin* aFont, con
-    if (IS_HIGH_SURROGATE(*curr) && (curr+1) < last && 
-        IS_LOW_SURROGATE(*(curr+1))) {
+    if (NS_IS_HIGH_SURROGATE(*curr) && (curr+1) < last && 
+        NS_IS_LOW_SURROGATE(*(curr+1))) {
Index: mozilla/gfx/src/windows/nsRenderingContextWin.cpp
===================================================================
RCS file: /cvsroot/mozilla/gfx/src/windows/nsRenderingContextWin.cpp,v
retrieving revision 3.181
diff -p -U 0 -r3.181 nsRenderingContextWin.cpp
--- mozilla/gfx/src/windows/nsRenderingContextWin.cpp	26 Jun 2006 22:18:22 -0000	3.181
+++ mozilla/gfx/src/windows/nsRenderingContextWin.cpp	13 Dec 2006 22:30:15 -0000
@@ -2270 +2270 @@ do_DrawString(const nsFontSwitch* aFontS
-      if (IS_HIGH_SURROGATE(*str) && 
+      if (NS_IS_HIGH_SURROGATE(*str) && 
@@ -2272 +2272 @@ do_DrawString(const nsFontSwitch* aFontS
-          IS_LOW_SURROGATE(*(str+1))) 
+          NS_IS_LOW_SURROGATE(*(str+1))) 
Index: mozilla/gfx/src/x11shared/nsFontFreeType.cpp
===================================================================
RCS file: /cvsroot/mozilla/gfx/src/x11shared/nsFontFreeType.cpp,v
retrieving revision 1.14
diff -p -U 0 -r1.14 nsFontFreeType.cpp
--- mozilla/gfx/src/x11shared/nsFontFreeType.cpp	17 Apr 2004 21:52:34 -0000	1.14
+++ mozilla/gfx/src/x11shared/nsFontFreeType.cpp	13 Dec 2006 22:30:15 -0000
@@ -330 +330 @@ nsFreeTypeFont::doGetBoundingMetrics(con
-    if(i<aLength-1 && IS_HIGH_SURROGATE(code_point) && IS_LOW_SURROGATE(aString[i+1])) {
+    if(i<aLength-1 && NS_IS_HIGH_SURROGATE(code_point) && NS_IS_LOW_SURROGATE(aString[i+1])) {
@@ -413 +413 @@ nsFreeTypeFont::GetWidth(const PRUnichar
-    if(i<aLength-1 && IS_HIGH_SURROGATE(code_point) && IS_LOW_SURROGATE(aString[i+1])) {
+    if(i<aLength-1 && NS_IS_HIGH_SURROGATE(code_point) && NS_IS_LOW_SURROGATE(aString[i+1])) {
@@ -744 +744 @@ nsFreeTypeXImage::DrawString(nsRendering
-    if(i<aLength-1 && IS_HIGH_SURROGATE(code_point) && IS_LOW_SURROGATE(aString[i+1])) {
+    if(i<aLength-1 && NS_IS_HIGH_SURROGATE(code_point) && NS_IS_LOW_SURROGATE(aString[i+1])) {
Index: mozilla/gfx/src/xlib/nsFontMetricsXlib.cpp
===================================================================
RCS file: /cvsroot/mozilla/gfx/src/xlib/nsFontMetricsXlib.cpp,v
retrieving revision 1.175
diff -p -U 0 -r1.175 nsFontMetricsXlib.cpp
--- mozilla/gfx/src/xlib/nsFontMetricsXlib.cpp	16 Oct 2006 19:04:34 -0000	1.175
+++ mozilla/gfx/src/xlib/nsFontMetricsXlib.cpp	13 Dec 2006 22:30:17 -0000
@@ -2436 +2436 @@ nsFontMetricsXlib::ResolveForwards(const
-  if (IS_HIGH_SURROGATE(*currChar) && (currChar+1) < lastChar && IS_LOW_SURROGATE(*(currChar+1))) {
+  if (NS_IS_HIGH_SURROGATE(*currChar) && (currChar+1) < lastChar && NS_IS_LOW_SURROGATE(*(currChar+1))) {
@@ -2457 +2457 @@ nsFontMetricsXlib::ResolveForwards(const
-    if (IS_HIGH_SURROGATE(*currChar) && (currChar+1) < lastChar && IS_LOW_SURROGATE(*(currChar+1))) {
+    if (NS_IS_HIGH_SURROGATE(*currChar) && (currChar+1) < lastChar && NS_IS_LOW_SURROGATE(*(currChar+1))) {
@@ -2470 +2470 @@ nsFontMetricsXlib::ResolveForwards(const
-    if (IS_HIGH_SURROGATE(*currChar) && (currChar+1) < lastChar && IS_LOW_SURROGATE(*(currChar+1))) {
+    if (NS_IS_HIGH_SURROGATE(*currChar) && (currChar+1) < lastChar && NS_IS_LOW_SURROGATE(*(currChar+1))) {
Index: mozilla/gfx/thebes/src/gfxPangoFonts.cpp
===================================================================
RCS file: /cvsroot/mozilla/gfx/thebes/src/gfxPangoFonts.cpp,v
retrieving revision 1.37
diff -p -U 0 -r1.37 gfxPangoFonts.cpp
--- mozilla/gfx/thebes/src/gfxPangoFonts.cpp	10 Dec 2006 14:01:36 -0000	1.37
+++ mozilla/gfx/thebes/src/gfxPangoFonts.cpp	13 Dec 2006 22:30:18 -0000
@@ -767 +767 @@ gfxXftTextRun::SetSpacing(const nsTArray
-            if (IS_HIGH_SURROGATE(mWString[i]))
+            if (NS_IS_HIGH_SURROGATE(mWString[i]))
@@ -1478 +1478 @@ gfxPangoTextRun::SetSpacing(const nsTArr
-        if (IS_HIGH_SURROGATE(mString[i]))
+        if (NS_IS_HIGH_SURROGATE(mString[i]))
Index: mozilla/gfx/thebes/src/gfxWindowsFonts.cpp
===================================================================
RCS file: /cvsroot/mozilla/gfx/thebes/src/gfxWindowsFonts.cpp,v
retrieving revision 1.69
diff -p -U 0 -r1.69 gfxWindowsFonts.cpp
--- mozilla/gfx/thebes/src/gfxWindowsFonts.cpp	6 Dec 2006 07:01:02 -0000	1.69
+++ mozilla/gfx/thebes/src/gfxWindowsFonts.cpp	13 Dec 2006 22:30:18 -0000
@@ -1259 +1259 @@ TRY_AGAIN_HOPE_FOR_THE_BEST_2:
-                    if ((la+1 < mLength) && IS_HIGH_SURROGATE(ch) && IS_LOW_SURROGATE(mString[la+1])) {
+                    if ((la+1 < mLength) && NS_IS_HIGH_SURROGATE(ch) && NS_IS_LOW_SURROGATE(mString[la+1])) {
@@ -1398 +1398 @@ private:
-            if (IS_HIGH_SURROGATE(mString[i]) || IS_LOW_SURROGATE(mString[i]))
+            if (NS_IS_HIGH_SURROGATE(mString[i]) || NS_IS_LOW_SURROGATE(mString[i]))
Index: mozilla/gfx/thebes/src/gfxWindowsPlatform.cpp
===================================================================
RCS file: /cvsroot/mozilla/gfx/thebes/src/gfxWindowsPlatform.cpp,v
retrieving revision 1.15
diff -p -U 0 -r1.15 gfxWindowsPlatform.cpp
--- mozilla/gfx/thebes/src/gfxWindowsPlatform.cpp	22 Nov 2006 17:50:38 -0000	1.15
+++ mozilla/gfx/thebes/src/gfxWindowsPlatform.cpp	13 Dec 2006 22:30:18 -0000
@@ -362 +362 @@ gfxWindowsPlatform::FindOtherFonts(const
-        if ((z+1 < aLength) && IS_HIGH_SURROGATE(ch) && IS_LOW_SURROGATE(aString[z+1])) {
+        if ((z+1 < aLength) && NS_IS_HIGH_SURROGATE(ch) && NS_IS_LOW_SURROGATE(aString[z+1])) {
Index: mozilla/intl/lwbrk/src/nsJISx4501LineBreaker.cpp
===================================================================
RCS file: /cvsroot/mozilla/intl/lwbrk/src/nsJISx4501LineBreaker.cpp,v
retrieving revision 1.52
diff -p -U 0 -r1.52 nsJISx4501LineBreaker.cpp
--- mozilla/intl/lwbrk/src/nsJISx4501LineBreaker.cpp	28 Aug 2006 20:12:32 -0000	1.52
+++ mozilla/intl/lwbrk/src/nsJISx4501LineBreaker.cpp	13 Dec 2006 22:30:18 -0000
@@ -405,2 +405,2 @@ PRBool nsJISx4051LineBreaker::BreakInBet
-     IS_HIGH_SURROGATE(aText1[aTextLen1-1]) && 
-     IS_LOW_SURROGATE(aText2[0]) )  //Do not separate a surrogate pair
+     NS_IS_HIGH_SURROGATE(aText1[aTextLen1-1]) && 
+     NS_IS_LOW_SURROGATE(aText2[0]) )  //Do not separate a surrogate pair
Index: mozilla/intl/uconv/ucvcn/nsUnicodeToGBK.cpp
===================================================================
RCS file: /cvsroot/mozilla/intl/uconv/ucvcn/nsUnicodeToGBK.cpp,v
retrieving revision 1.27
diff -p -U 0 -r1.27 nsUnicodeToGBK.cpp
--- mozilla/intl/uconv/ucvcn/nsUnicodeToGBK.cpp	7 Aug 2006 07:57:29 -0000	1.27
+++ mozilla/intl/uconv/ucvcn/nsUnicodeToGBK.cpp	13 Dec 2006 22:30:19 -0000
@@ -121,2 +121,2 @@ PRBool nsUnicodeToGB18030::EncodeSurroga
-  if( IS_HIGH_SURROGATE(aSurrogateHigh) && 
-      IS_LOW_SURROGATE(aSurrogateLow) )
+  if( NS_IS_HIGH_SURROGATE(aSurrogateHigh) && 
+      NS_IS_LOW_SURROGATE(aSurrogateLow) )
@@ -340,2 +340,2 @@ PRBool nsUnicodeToGBK::TryExtensionEncod
-  if( IS_HIGH_SURROGATE(aChar) || 
-      IS_LOW_SURROGATE(aChar) )
+  if( NS_IS_HIGH_SURROGATE(aChar) || 
+      NS_IS_LOW_SURROGATE(aChar) )
@@ -365,2 +365,2 @@ PRBool nsUnicodeToGBK::Try4BytesEncoder(
-  if( IS_HIGH_SURROGATE(aChar) || 
-      IS_LOW_SURROGATE(aChar) )
+  if( NS_IS_HIGH_SURROGATE(aChar) || 
+      NS_IS_LOW_SURROGATE(aChar) )
@@ -452 +452 @@ NS_IMETHODIMP nsUnicodeToGBK::ConvertNoB
-          if( IS_HIGH_SURROGATE(unicode) )
+          if( NS_IS_HIGH_SURROGATE(unicode) )
@@ -472 +472 @@ NS_IMETHODIMP nsUnicodeToGBK::ConvertNoB
-            if( IS_LOW_SURROGATE(unicode) )
+            if( NS_IS_LOW_SURROGATE(unicode) )
@@ -474 +474 @@ NS_IMETHODIMP nsUnicodeToGBK::ConvertNoB
-              if(IS_HIGH_SURROGATE(mSurrogateHigh)) {
+              if(NS_IS_HIGH_SURROGATE(mSurrogateHigh)) {
Index: mozilla/intl/unicharutil/src/nsEntityConverter.cpp
===================================================================
RCS file: /cvsroot/mozilla/intl/unicharutil/src/nsEntityConverter.cpp,v
retrieving revision 1.33
diff -p -U 0 -r1.33 nsEntityConverter.cpp
--- mozilla/intl/unicharutil/src/nsEntityConverter.cpp	19 Mar 2006 07:08:11 -0000	1.33
+++ mozilla/intl/unicharutil/src/nsEntityConverter.cpp	13 Dec 2006 22:30:19 -0000
@@ -236 +236 @@ nsEntityConverter::ConvertToEntities(con
-    if (IS_HIGH_SURROGATE(inString[i]) &&
+    if (NS_IS_HIGH_SURROGATE(inString[i]) &&
@@ -238 +238 @@ nsEntityConverter::ConvertToEntities(con
-        IS_LOW_SURROGATE(inString[i + 1])) {
+        NS_IS_LOW_SURROGATE(inString[i + 1])) {
Index: mozilla/intl/unicharutil/src/nsSaveAsCharset.cpp
===================================================================
RCS file: /cvsroot/mozilla/intl/unicharutil/src/nsSaveAsCharset.cpp,v
retrieving revision 1.33
diff -p -U 0 -r1.33 nsSaveAsCharset.cpp
--- mozilla/intl/unicharutil/src/nsSaveAsCharset.cpp	2 Apr 2005 18:44:00 -0000	1.33
+++ mozilla/intl/unicharutil/src/nsSaveAsCharset.cpp	13 Dec 2006 22:30:19 -0000
@@ -255,2 +255,2 @@ nsSaveAsCharset::DoCharsetConversion(con
-      if (IS_HIGH_SURROGATE(inString[pos1-1]) && 
-          inStringLength > pos1 && IS_LOW_SURROGATE(inString[pos1])) {
+      if (NS_IS_HIGH_SURROGATE(inString[pos1-1]) && 
+          inStringLength > pos1 && NS_IS_LOW_SURROGATE(inString[pos1])) {
Index: mozilla/intl/unicharutil/src/nsUnicodeNormalizer.cpp
===================================================================
RCS file: /cvsroot/mozilla/intl/unicharutil/src/nsUnicodeNormalizer.cpp,v
retrieving revision 1.7
diff -p -U 0 -r1.7 nsUnicodeNormalizer.cpp
--- mozilla/intl/unicharutil/src/nsUnicodeNormalizer.cpp	5 Apr 2005 23:00:13 -0000	1.7
+++ mozilla/intl/unicharutil/src/nsUnicodeNormalizer.cpp	13 Dec 2006 22:30:19 -0000
@@ -395 +395 @@ mdn_normalize(PRBool do_composition, PRB
-		if (IS_HIGH_SURROGATE(curChar) && start != end && IS_LOW_SURROGATE(*(start)) ) {
+		if (NS_IS_HIGH_SURROGATE(curChar) && start != end && NS_IS_LOW_SURROGATE(*(start)) ) {
Index: mozilla/intl/unicharutil/tests/NormalizationTest.cpp
===================================================================
RCS file: /cvsroot/mozilla/intl/unicharutil/tests/NormalizationTest.cpp,v
retrieving revision 1.2
diff -p -U 0 -r1.2 NormalizationTest.cpp
--- mozilla/intl/unicharutil/tests/NormalizationTest.cpp	2 Aug 2006 15:45:39 -0000	1.2
+++ mozilla/intl/unicharutil/tests/NormalizationTest.cpp	13 Dec 2006 22:30:19 -0000
@@ -164,2 +164,2 @@ PRUint32 UTF32CodepointFromTestcase(test
-  NS_ASSERTION(IS_HIGH_SURROGATE(testLine->c1[0]) &&
-               IS_LOW_SURROGATE(testLine->c1[1]),
+  NS_ASSERTION(NS_IS_HIGH_SURROGATE(testLine->c1[0]) &&
+               NS_IS_LOW_SURROGATE(testLine->c1[1]),
Index: mozilla/layout/base/nsLayoutUtils.cpp
===================================================================
RCS file: /cvsroot/mozilla/layout/base/nsLayoutUtils.cpp,v
retrieving revision 3.66
diff -p -U 0 -r3.66 nsLayoutUtils.cpp
--- mozilla/layout/base/nsLayoutUtils.cpp	8 Dec 2006 05:38:25 -0000	3.66
+++ mozilla/layout/base/nsLayoutUtils.cpp	13 Dec 2006 22:30:20 -0000
@@ -917 +917 @@ nsLayoutUtils::BinarySearchForPosition(n
-  if ((range == 1) || (range == 2 && IS_HIGH_SURROGATE(aText[aStartInx]))) {
+  if ((range == 1) || (range == 2 && NS_IS_HIGH_SURROGATE(aText[aStartInx]))) {
@@ -926 +926 @@ nsLayoutUtils::BinarySearchForPosition(n
-  if (IS_HIGH_SURROGATE(aText[inx-1]))
+  if (NS_IS_HIGH_SURROGATE(aText[inx-1]))
Index: mozilla/layout/generic/nsTextFrame.cpp
===================================================================
RCS file: /cvsroot/mozilla/layout/generic/nsTextFrame.cpp,v
retrieving revision 1.603
diff -p -U 0 -r1.603 nsTextFrame.cpp
--- mozilla/layout/generic/nsTextFrame.cpp	12 Dec 2006 18:12:46 -0000	1.603
+++ mozilla/layout/generic/nsTextFrame.cpp	13 Dec 2006 22:30:22 -0000
@@ -3249 +3249 @@ nsTextFrame::GetPositionSlowly(nsIRender
-          (! IS_LOW_SURROGATE(paintBuffer.mBuffer[ip[i]-mContentOffset]))) {
+          (! NS_IS_LOW_SURROGATE(paintBuffer.mBuffer[ip[i]-mContentOffset]))) {
@@ -3373,2 +3373,2 @@ nsTextFrame::RenderString(nsIRenderingCo
-    else if (IS_HIGH_SURROGATE(ch) && aLength > 0 &&
-           IS_LOW_SURROGATE(*(aBuffer+1))) {
+    else if (NS_IS_HIGH_SURROGATE(ch) && aLength > 0 &&
+           NS_IS_LOW_SURROGATE(*(aBuffer+1))) {
@@ -3503,2 +3503,2 @@ nsTextFrame::GetTextDimensionsOrLength(n
-      if (IS_HIGH_SURROGATE(ch) && length > 0 &&
-        IS_LOW_SURROGATE(*inBuffer)) {
+      if (NS_IS_HIGH_SURROGATE(ch) && length > 0 &&
+        NS_IS_LOW_SURROGATE(*inBuffer)) {
@@ -4156 +4156 @@ nsTextFrame::GetPositionHelper(const nsP
-          if (IS_HIGH_SURROGATE(text[indx]))
+          if (NS_IS_HIGH_SURROGATE(text[indx]))
@@ -4181 +4181 @@ nsTextFrame::GetPositionHelper(const nsP
-              (! IS_LOW_SURROGATE(paintBuffer.mBuffer[ip[i]-mContentOffset]))) {
+              (! NS_IS_LOW_SURROGATE(paintBuffer.mBuffer[ip[i]-mContentOffset]))) {
@@ -4546 +4546 @@ nsTextFrame::PeekOffsetCharacter(PRBool 
-          (! IS_LOW_SURROGATE(paintBuffer.mBuffer[ip[i]-mContentOffset])))
+          (! NS_IS_LOW_SURROGATE(paintBuffer.mBuffer[ip[i]-mContentOffset])))
@@ -4596 +4596 @@ nsTextFrame::PeekOffsetCharacter(PRBool 
-           (!IS_LOW_SURROGATE(paintBuffer.mBuffer[ip[i] - mContentOffset])) &&
+           (!NS_IS_LOW_SURROGATE(paintBuffer.mBuffer[ip[i] - mContentOffset])) &&
Index: mozilla/layout/xul/base/src/nsTextBoxFrame.cpp
===================================================================
RCS file: /cvsroot/mozilla/layout/xul/base/src/nsTextBoxFrame.cpp,v
retrieving revision 1.100
diff -p -U 0 -r1.100 nsTextBoxFrame.cpp
--- mozilla/layout/xul/base/src/nsTextBoxFrame.cpp	8 Dec 2006 05:38:32 -0000	1.100
+++ mozilla/layout/xul/base/src/nsTextBoxFrame.cpp	13 Dec 2006 22:30:22 -0000
@@ -550 +550 @@ nsTextBoxFrame::CalculateTitleForWidth(n
-              ((IS_HIGH_SURROGATE(mTitle.CharAt(i))) &&
+              ((NS_IS_HIGH_SURROGATE(mTitle.CharAt(i))) &&
@@ -552 +552 @@ nsTextBoxFrame::CalculateTitleForWidth(n
-               (IS_LOW_SURROGATE(mTitle.CharAt(i))) &&
+               (NS_IS_LOW_SURROGATE(mTitle.CharAt(i))) &&
Index: mozilla/mailnews/base/util/nsMsgUtils.cpp
===================================================================
RCS file: /cvsroot/mozilla/mailnews/base/util/nsMsgUtils.cpp,v
retrieving revision 1.120
diff -p -U 0 -r1.120 nsMsgUtils.cpp
--- mozilla/mailnews/base/util/nsMsgUtils.cpp	26 Nov 2006 19:55:56 -0000	1.120
+++ mozilla/mailnews/base/util/nsMsgUtils.cpp	13 Dec 2006 22:30:23 -0000
@@ -389 +389 @@ nsresult NS_MsgHashIfNecessary(nsAutoStr
-    if (IS_HIGH_SURROGATE(name.CharAt(keptLength-1)))
+    if (NS_IS_HIGH_SURROGATE(name.CharAt(keptLength-1)))
Index: mozilla/netwerk/dns/src/nsIDNService.cpp
===================================================================
RCS file: /cvsroot/mozilla/netwerk/dns/src/nsIDNService.cpp,v
retrieving revision 1.29
diff -p -U 0 -r1.29 nsIDNService.cpp
--- mozilla/netwerk/dns/src/nsIDNService.cpp	3 Feb 2006 14:18:25 -0000	1.29
+++ mozilla/netwerk/dns/src/nsIDNService.cpp	13 Dec 2006 22:30:23 -0000
@@ -299,2 +299,2 @@ static void utf16ToUcs4(const nsAString&
-        IS_HIGH_SURROGATE(curChar) && 
-        IS_LOW_SURROGATE(*start)) {
+        NS_IS_HIGH_SURROGATE(curChar) && 
+        NS_IS_LOW_SURROGATE(*start)) {
Index: mozilla/toolkit/components/history/src/nsGlobalHistory.cpp
===================================================================
RCS file: /cvsroot/mozilla/toolkit/components/history/src/nsGlobalHistory.cpp,v
retrieving revision 1.78
diff -p -U 0 -r1.78 nsGlobalHistory.cpp
--- mozilla/toolkit/components/history/src/nsGlobalHistory.cpp	28 Aug 2006 20:12:36 -0000	1.78
+++ mozilla/toolkit/components/history/src/nsGlobalHistory.cpp	13 Dec 2006 22:30:24 -0000
@@ -1132 +1132 @@ nsGlobalHistory::SetPageTitle(nsIURI *aU
-      IS_HIGH_SURROGATE(titleString.Last()))
+      NS_IS_HIGH_SURROGATE(titleString.Last()))
Index: mozilla/uriloader/exthandler/nsExternalHelperAppService.cpp
===================================================================
RCS file: /cvsroot/mozilla/uriloader/exthandler/nsExternalHelperAppService.cpp,v
retrieving revision 1.308
diff -p -U 0 -r1.308 nsExternalHelperAppService.cpp
--- mozilla/uriloader/exthandler/nsExternalHelperAppService.cpp	4 Nov 2006 10:09:59 -0000	1.308
+++ mozilla/uriloader/exthandler/nsExternalHelperAppService.cpp	13 Dec 2006 22:30:25 -0000
@@ -1248 +1248 @@ PRBool nsExternalHelperAppService::promp
-      if (IS_LOW_SURROGATE(uri[charIdx]))
+      if (NS_IS_LOW_SURROGATE(uri[charIdx]))
@@ -1255 +1255 @@ PRBool nsExternalHelperAppService::promp
-        if (IS_HIGH_SURROGATE(uri[charIdx + numCharsToCrop - 1]))
+        if (NS_IS_HIGH_SURROGATE(uri[charIdx + numCharsToCrop - 1]))
Index: mozilla/xpcom/ds/nsCRT.cpp
===================================================================
RCS file: /cvsroot/mozilla/xpcom/ds/nsCRT.cpp,v
retrieving revision 3.59
diff -p -U 0 -r3.59 nsCRT.cpp
--- mozilla/xpcom/ds/nsCRT.cpp	3 May 2006 16:10:40 -0000	3.59
+++ mozilla/xpcom/ds/nsCRT.cpp	13 Dec 2006 22:30:25 -0000
@@ -255 +255 @@ PRUint32 nsCRT::HashCodeAsUTF8(const PRU
-            else if ( IS_HIGH_SURROGATE(W) )
+            else if ( NS_IS_HIGH_SURROGATE(W) )
@@ -266 +266 @@ PRUint32 nsCRT::HashCodeAsUTF8(const PRU
-            if ( IS_LOW_SURROGATE(W) )
+            if ( NS_IS_LOW_SURROGATE(W) )
Index: mozilla/xpcom/string/public/nsUTF8Utils.h
===================================================================
RCS file: /cvsroot/mozilla/xpcom/string/public/nsUTF8Utils.h,v
retrieving revision 1.13
diff -p -U 0 -r1.13 nsUTF8Utils.h
--- mozilla/xpcom/string/public/nsUTF8Utils.h	17 Nov 2005 15:13:25 -0000	1.13
+++ mozilla/xpcom/string/public/nsUTF8Utils.h	13 Dec 2006 22:30:26 -0000
@@ -294 +294 @@ public:
-    else if (IS_HIGH_SURROGATE(c)) // U+D800 - U+DBFF
+    else if (NS_IS_HIGH_SURROGATE(c)) // U+D800 - U+DBFF
@@ -310 +310 @@ public:
-        if (IS_LOW_SURROGATE(c))
+        if (NS_IS_LOW_SURROGATE(c))
@@ -358 +358 @@ public:
-    else if (IS_HIGH_SURROGATE(c)) // U+D800 - U+DBFF
+    else if (NS_IS_HIGH_SURROGATE(c)) // U+D800 - U+DBFF
@@ -373 +373 @@ public:
-        if (IS_LOW_SURROGATE(c))
+        if (NS_IS_LOW_SURROGATE(c))
@@ -597 +597 @@ class ConvertUTF16toUTF8
-            else if (IS_HIGH_SURROGATE(c)) // U+D800 - U+DBFF
+            else if (NS_IS_HIGH_SURROGATE(c)) // U+D800 - U+DBFF
@@ -611 +611 @@ class ConvertUTF16toUTF8
-                if (IS_LOW_SURROGATE(c))
+                if (NS_IS_LOW_SURROGATE(c))
Index: mozilla/xpfe/components/history/src/nsGlobalHistory.cpp
===================================================================
RCS file: /cvsroot/mozilla/xpfe/components/history/src/nsGlobalHistory.cpp,v
retrieving revision 1.224
diff -p -U 0 -r1.224 nsGlobalHistory.cpp
--- mozilla/xpfe/components/history/src/nsGlobalHistory.cpp	24 Sep 2006 15:52:53 -0000	1.224
+++ mozilla/xpfe/components/history/src/nsGlobalHistory.cpp	13 Dec 2006 22:30:27 -0000
@@ -1073 +1073 @@ nsGlobalHistory::SetPageTitle(nsIURI *aU
-      IS_HIGH_SURROGATE(titleString.Last()))
+      NS_IS_HIGH_SURROGATE(titleString.Last()))