From 9e4bdbf96e0eea21ffefb6265e0eca6ae616b8be Mon Sep 17 00:00:00 2001
From: "rickg%netscape.com"
 <rickg%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 23 Jul 1998 09:17:45 +0000
Subject: [PATCH] tried again to fix linux build

git-svn-id: svn://10.0.0.236/trunk@6242 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/htmlparser/src/nsHTMLTokens.cpp        | 10 ----------
 mozilla/htmlparser/src/nsHTMLTokens.h          |  1 -
 mozilla/htmlparser/src/nsParser.cpp            |  2 +-
 mozilla/parser/htmlparser/src/nsHTMLTokens.cpp | 10 ----------
 mozilla/parser/htmlparser/src/nsHTMLTokens.h   |  1 -
 mozilla/parser/htmlparser/src/nsParser.cpp     |  2 +-
 6 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/mozilla/htmlparser/src/nsHTMLTokens.cpp b/mozilla/htmlparser/src/nsHTMLTokens.cpp
index 54a044654c0..68d794cb6ae 100644
--- a/mozilla/htmlparser/src/nsHTMLTokens.cpp
+++ b/mozilla/htmlparser/src/nsHTMLTokens.cpp
@@ -1317,16 +1317,6 @@ PRInt32 CStyleToken::GetTokenType(void) {
   return eToken_style;
 }
 
-/*
- *  default constructor
- *  
- *  @update  gess 3/25/98
- *  @param   aName -- string to init token name with
- *  @return  
- */
-CSkippedContentToken::CSkippedContentToken() : CAttributeToken() {
-}
-
 
 /*
  *  string based constructor
diff --git a/mozilla/htmlparser/src/nsHTMLTokens.h b/mozilla/htmlparser/src/nsHTMLTokens.h
index c9c09152c3b..073e63dd126 100644
--- a/mozilla/htmlparser/src/nsHTMLTokens.h
+++ b/mozilla/htmlparser/src/nsHTMLTokens.h
@@ -295,7 +295,6 @@ class CStyleToken: public CHTMLToken {
  */
 class CSkippedContentToken: public CAttributeToken {
   public:
-                        CSkippedContentToken();
                         CSkippedContentToken(const nsString& aString);
     virtual nsresult    Consume(PRUnichar aChar,CScanner& aScanner);
     virtual const char* GetClassName(void);
diff --git a/mozilla/htmlparser/src/nsParser.cpp b/mozilla/htmlparser/src/nsParser.cpp
index d375516ae21..7ac0146cbf5 100644
--- a/mozilla/htmlparser/src/nsParser.cpp
+++ b/mozilla/htmlparser/src/nsParser.cpp
@@ -743,7 +743,7 @@ nsresult nsParser::OnDataAvailable(nsIURL* aURL, nsIInputStream *pIStream, PRInt
 
       if(eUnknownDetect==mParserContext->mAutoDetectStatus) {
         if(eValidDetect==AutoDetectContentType(mParserContext->mScanner->GetBuffer(),mParserContext->mSourceType)) {
-          nsresult result=WillBuildModel(mParserContext->mScanner->GetFilename());
+          WillBuildModel(mParserContext->mScanner->GetFilename());
         } //if
       }
     } //if
diff --git a/mozilla/parser/htmlparser/src/nsHTMLTokens.cpp b/mozilla/parser/htmlparser/src/nsHTMLTokens.cpp
index 54a044654c0..68d794cb6ae 100644
--- a/mozilla/parser/htmlparser/src/nsHTMLTokens.cpp
+++ b/mozilla/parser/htmlparser/src/nsHTMLTokens.cpp
@@ -1317,16 +1317,6 @@ PRInt32 CStyleToken::GetTokenType(void) {
   return eToken_style;
 }
 
-/*
- *  default constructor
- *  
- *  @update  gess 3/25/98
- *  @param   aName -- string to init token name with
- *  @return  
- */
-CSkippedContentToken::CSkippedContentToken() : CAttributeToken() {
-}
-
 
 /*
  *  string based constructor
diff --git a/mozilla/parser/htmlparser/src/nsHTMLTokens.h b/mozilla/parser/htmlparser/src/nsHTMLTokens.h
index c9c09152c3b..073e63dd126 100644
--- a/mozilla/parser/htmlparser/src/nsHTMLTokens.h
+++ b/mozilla/parser/htmlparser/src/nsHTMLTokens.h
@@ -295,7 +295,6 @@ class CStyleToken: public CHTMLToken {
  */
 class CSkippedContentToken: public CAttributeToken {
   public:
-                        CSkippedContentToken();
                         CSkippedContentToken(const nsString& aString);
     virtual nsresult    Consume(PRUnichar aChar,CScanner& aScanner);
     virtual const char* GetClassName(void);
diff --git a/mozilla/parser/htmlparser/src/nsParser.cpp b/mozilla/parser/htmlparser/src/nsParser.cpp
index d375516ae21..7ac0146cbf5 100644
--- a/mozilla/parser/htmlparser/src/nsParser.cpp
+++ b/mozilla/parser/htmlparser/src/nsParser.cpp
@@ -743,7 +743,7 @@ nsresult nsParser::OnDataAvailable(nsIURL* aURL, nsIInputStream *pIStream, PRInt
 
       if(eUnknownDetect==mParserContext->mAutoDetectStatus) {
         if(eValidDetect==AutoDetectContentType(mParserContext->mScanner->GetBuffer(),mParserContext->mSourceType)) {
-          nsresult result=WillBuildModel(mParserContext->mScanner->GetFilename());
+          WillBuildModel(mParserContext->mScanner->GetFilename());
         } //if
       }
     } //if