diff --git a/mozilla/htmlparser/src/nsHTMLContentSinkStream.cpp b/mozilla/htmlparser/src/nsHTMLContentSinkStream.cpp
index c35160822a4..76612c27147 100644
--- a/mozilla/htmlparser/src/nsHTMLContentSinkStream.cpp
+++ b/mozilla/htmlparser/src/nsHTMLContentSinkStream.cpp
@@ -171,7 +171,7 @@ void WriteAttributes(const nsIParserNode& aNode,ostream& aStream) {
  * @param 
  * @return
  */
-void OpenTagWithAttributes(const char* theTag,const nsIParserNode& aNode,int tab,ostream& aStream,bool aNewline) {
+void OpenTagWithAttributes(const char* theTag,const nsIParserNode& aNode,int tab,ostream& aStream,PRBool aNewline) {
   int i=0;
   for(i=0;i<tab*gTabSize;i++) 
     aStream << " ";
@@ -189,7 +189,7 @@ void OpenTagWithAttributes(const char* theTag,const nsIParserNode& aNode,int tab
  * @param 
  * @return
  */
-void OpenTag(const char* theTag,int tab,ostream& aStream,bool aNewline) {
+void OpenTag(const char* theTag,int tab,ostream& aStream,PRBool aNewline) {
   int i=0;
   for(i=0;i<tab*gTabSize;i++) 
     aStream << " ";
@@ -221,7 +221,7 @@ void CloseTag(const char* theTag,int tab,ostream& aStream) {
  */
 void WritePair(eHTMLTags aTag,const nsString& theContent,int tab,ostream& aStream) {
   const char* titleStr = GetTagName(aTag);
-  OpenTag(titleStr,tab,aStream,false);
+  OpenTag(titleStr,tab,aStream,PR_FALSE);
   theContent.ToCString(gBuffer,sizeof(gBuffer)-1);
   aStream << gBuffer;
   CloseTag(titleStr,0,aStream);
@@ -237,7 +237,7 @@ void WritePair(eHTMLTags aTag,const nsString& theContent,int tab,ostream& aStrea
  */
 void WriteSingleton(eHTMLTags aTag,const nsString& theContent,int tab,ostream& aStream) {
   const char* titleStr = GetTagName(aTag);
-  OpenTag(titleStr,tab,aStream,false);
+  OpenTag(titleStr,tab,aStream,PR_FALSE);
   if(theContent.Length()) {
     theContent.ToCString(gBuffer,sizeof(gBuffer)-1);
     aStream << gBuffer;
@@ -275,7 +275,7 @@ PRInt32 CHTMLContentSinkStream::OpenHTML(const nsIParserNode& aNode){
   mTabLevel++;
   if(mOutput) {
     const char* theTag= GetTagName(eHTMLTag_html);
-    OpenTagWithAttributes(theTag,aNode,mTabLevel,*mOutput,true);
+    OpenTagWithAttributes(theTag,aNode,mTabLevel,*mOutput,PR_TRUE);
   }
   return result;
 }
@@ -311,7 +311,7 @@ PRInt32 CHTMLContentSinkStream::OpenHead(const nsIParserNode& aNode){
   mTabLevel++;
   if(mOutput) {
     const char* theTag= GetTagName(eHTMLTag_head);
-    OpenTagWithAttributes(theTag,aNode,mTabLevel,*mOutput,true);
+    OpenTagWithAttributes(theTag,aNode,mTabLevel,*mOutput,PR_TRUE);
   }
   return result;
 }
@@ -347,7 +347,7 @@ PRInt32 CHTMLContentSinkStream::OpenBody(const nsIParserNode& aNode){
   mTabLevel++;
   if(mOutput) {
     const char* theTag= GetTagName(eHTMLTag_body);
-    OpenTagWithAttributes(theTag,aNode,mTabLevel,*mOutput,true);
+    OpenTagWithAttributes(theTag,aNode,mTabLevel,*mOutput,PR_TRUE);
   }
   return result;
 }
@@ -383,7 +383,7 @@ PRInt32 CHTMLContentSinkStream::OpenForm(const nsIParserNode& aNode){
   mTabLevel++;
   if(mOutput) {
     const char* theTag= GetTagName(eHTMLTag_form);
-    OpenTagWithAttributes(theTag,aNode,mTabLevel,*mOutput,true);
+    OpenTagWithAttributes(theTag,aNode,mTabLevel,*mOutput,PR_TRUE);
   }
   return result;
 }
@@ -419,7 +419,7 @@ PRInt32 CHTMLContentSinkStream::OpenFrameset(const nsIParserNode& aNode){
   mTabLevel++;
   if(mOutput) {
     const char* theTag= GetTagName(eHTMLTag_frameset);
-    OpenTagWithAttributes(theTag,aNode,mTabLevel,*mOutput,true);
+    OpenTagWithAttributes(theTag,aNode,mTabLevel,*mOutput,PR_TRUE);
   }
   return result;
 }
@@ -487,7 +487,7 @@ PRInt32 CHTMLContentSinkStream::OpenContainer(const nsIParserNode& aNode){
         {
           const nsString& name=aNode.GetName();
           const char* tagName= GetTagName(nodeType);
-          OpenTagWithAttributes(tagName,aNode,mTabLevel,*mOutput,true);
+          OpenTagWithAttributes(tagName,aNode,mTabLevel,*mOutput,PR_TRUE);
         }
         break;
     }
diff --git a/mozilla/parser/htmlparser/src/nsHTMLContentSinkStream.cpp b/mozilla/parser/htmlparser/src/nsHTMLContentSinkStream.cpp
index c35160822a4..76612c27147 100644
--- a/mozilla/parser/htmlparser/src/nsHTMLContentSinkStream.cpp
+++ b/mozilla/parser/htmlparser/src/nsHTMLContentSinkStream.cpp
@@ -171,7 +171,7 @@ void WriteAttributes(const nsIParserNode& aNode,ostream& aStream) {
  * @param 
  * @return
  */
-void OpenTagWithAttributes(const char* theTag,const nsIParserNode& aNode,int tab,ostream& aStream,bool aNewline) {
+void OpenTagWithAttributes(const char* theTag,const nsIParserNode& aNode,int tab,ostream& aStream,PRBool aNewline) {
   int i=0;
   for(i=0;i<tab*gTabSize;i++) 
     aStream << " ";
@@ -189,7 +189,7 @@ void OpenTagWithAttributes(const char* theTag,const nsIParserNode& aNode,int tab
  * @param 
  * @return
  */
-void OpenTag(const char* theTag,int tab,ostream& aStream,bool aNewline) {
+void OpenTag(const char* theTag,int tab,ostream& aStream,PRBool aNewline) {
   int i=0;
   for(i=0;i<tab*gTabSize;i++) 
     aStream << " ";
@@ -221,7 +221,7 @@ void CloseTag(const char* theTag,int tab,ostream& aStream) {
  */
 void WritePair(eHTMLTags aTag,const nsString& theContent,int tab,ostream& aStream) {
   const char* titleStr = GetTagName(aTag);
-  OpenTag(titleStr,tab,aStream,false);
+  OpenTag(titleStr,tab,aStream,PR_FALSE);
   theContent.ToCString(gBuffer,sizeof(gBuffer)-1);
   aStream << gBuffer;
   CloseTag(titleStr,0,aStream);
@@ -237,7 +237,7 @@ void WritePair(eHTMLTags aTag,const nsString& theContent,int tab,ostream& aStrea
  */
 void WriteSingleton(eHTMLTags aTag,const nsString& theContent,int tab,ostream& aStream) {
   const char* titleStr = GetTagName(aTag);
-  OpenTag(titleStr,tab,aStream,false);
+  OpenTag(titleStr,tab,aStream,PR_FALSE);
   if(theContent.Length()) {
     theContent.ToCString(gBuffer,sizeof(gBuffer)-1);
     aStream << gBuffer;
@@ -275,7 +275,7 @@ PRInt32 CHTMLContentSinkStream::OpenHTML(const nsIParserNode& aNode){
   mTabLevel++;
   if(mOutput) {
     const char* theTag= GetTagName(eHTMLTag_html);
-    OpenTagWithAttributes(theTag,aNode,mTabLevel,*mOutput,true);
+    OpenTagWithAttributes(theTag,aNode,mTabLevel,*mOutput,PR_TRUE);
   }
   return result;
 }
@@ -311,7 +311,7 @@ PRInt32 CHTMLContentSinkStream::OpenHead(const nsIParserNode& aNode){
   mTabLevel++;
   if(mOutput) {
     const char* theTag= GetTagName(eHTMLTag_head);
-    OpenTagWithAttributes(theTag,aNode,mTabLevel,*mOutput,true);
+    OpenTagWithAttributes(theTag,aNode,mTabLevel,*mOutput,PR_TRUE);
   }
   return result;
 }
@@ -347,7 +347,7 @@ PRInt32 CHTMLContentSinkStream::OpenBody(const nsIParserNode& aNode){
   mTabLevel++;
   if(mOutput) {
     const char* theTag= GetTagName(eHTMLTag_body);
-    OpenTagWithAttributes(theTag,aNode,mTabLevel,*mOutput,true);
+    OpenTagWithAttributes(theTag,aNode,mTabLevel,*mOutput,PR_TRUE);
   }
   return result;
 }
@@ -383,7 +383,7 @@ PRInt32 CHTMLContentSinkStream::OpenForm(const nsIParserNode& aNode){
   mTabLevel++;
   if(mOutput) {
     const char* theTag= GetTagName(eHTMLTag_form);
-    OpenTagWithAttributes(theTag,aNode,mTabLevel,*mOutput,true);
+    OpenTagWithAttributes(theTag,aNode,mTabLevel,*mOutput,PR_TRUE);
   }
   return result;
 }
@@ -419,7 +419,7 @@ PRInt32 CHTMLContentSinkStream::OpenFrameset(const nsIParserNode& aNode){
   mTabLevel++;
   if(mOutput) {
     const char* theTag= GetTagName(eHTMLTag_frameset);
-    OpenTagWithAttributes(theTag,aNode,mTabLevel,*mOutput,true);
+    OpenTagWithAttributes(theTag,aNode,mTabLevel,*mOutput,PR_TRUE);
   }
   return result;
 }
@@ -487,7 +487,7 @@ PRInt32 CHTMLContentSinkStream::OpenContainer(const nsIParserNode& aNode){
         {
           const nsString& name=aNode.GetName();
           const char* tagName= GetTagName(nodeType);
-          OpenTagWithAttributes(tagName,aNode,mTabLevel,*mOutput,true);
+          OpenTagWithAttributes(tagName,aNode,mTabLevel,*mOutput,PR_TRUE);
         }
         break;
     }