From 3dd9b150e53363bb04312d246448ac9c5f923a80 Mon Sep 17 00:00:00 2001
From: "hpradhan%hotpop.com"
 <hpradhan%hotpop.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 24 Sep 2003 07:30:16 +0000
Subject: [PATCH] Bug 170985 : fix for gcc3.4 bustage

git-svn-id: svn://10.0.0.236/trunk@147226 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/content/html/document/src/nsHTMLContentSink.cpp | 3 ++-
 mozilla/htmlparser/public/nsHTMLTagList.h               | 1 -
 mozilla/htmlparser/public/nsHTMLTags.h                  | 4 ++++
 mozilla/parser/htmlparser/public/nsHTMLTagList.h        | 1 -
 mozilla/parser/htmlparser/public/nsHTMLTags.h           | 4 ++++
 5 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/mozilla/content/html/document/src/nsHTMLContentSink.cpp b/mozilla/content/html/document/src/nsHTMLContentSink.cpp
index cf08afe9f1a..3a0b5c9feba 100644
--- a/mozilla/content/html/document/src/nsHTMLContentSink.cpp
+++ b/mozilla/content/html/document/src/nsHTMLContentSink.cpp
@@ -229,9 +229,10 @@ NS_NewHTMLNOTUSEDElement(nsIHTMLContent** aResult, nsINodeInfo *aNodeInfo)
 static const contentCreatorCallback sContentCreatorCallbacks[] = {
   NS_NewHTMLUnknownElement,
 #include "nsHTMLTagList.h"
-};
 #undef HTML_TAG
 #undef HTML_OTHER
+  NS_NewHTMLUnknownElement
+};
 
 class SinkContext;
 
diff --git a/mozilla/htmlparser/public/nsHTMLTagList.h b/mozilla/htmlparser/public/nsHTMLTagList.h
index 967afb04909..d8e4d7609cb 100644
--- a/mozilla/htmlparser/public/nsHTMLTagList.h
+++ b/mozilla/htmlparser/public/nsHTMLTagList.h
@@ -192,4 +192,3 @@ HTML_OTHER(entity, Span)
 HTML_OTHER(doctypeDecl, Span)
 HTML_OTHER(markupDecl, Span)
 HTML_OTHER(instruction, Span)
-HTML_OTHER(userdefined, Unknown)
diff --git a/mozilla/htmlparser/public/nsHTMLTags.h b/mozilla/htmlparser/public/nsHTMLTags.h
index 9f771ecc307..e826dc6d1c3 100644
--- a/mozilla/htmlparser/public/nsHTMLTags.h
+++ b/mozilla/htmlparser/public/nsHTMLTags.h
@@ -54,6 +54,10 @@ enum nsHTMLTag {
   /* this enum must be first and must be zero */
   eHTMLTag_unknown = 0,
 #include "nsHTMLTagList.h"
+
+  /* can't be moved into nsHTMLTagList since gcc3.4 doesn't like a
+     comma at the end of enum list*/
+  eHTMLTag_userdefined
 };
 #undef HTML_TAG
 #undef HTML_OTHER
diff --git a/mozilla/parser/htmlparser/public/nsHTMLTagList.h b/mozilla/parser/htmlparser/public/nsHTMLTagList.h
index 967afb04909..d8e4d7609cb 100644
--- a/mozilla/parser/htmlparser/public/nsHTMLTagList.h
+++ b/mozilla/parser/htmlparser/public/nsHTMLTagList.h
@@ -192,4 +192,3 @@ HTML_OTHER(entity, Span)
 HTML_OTHER(doctypeDecl, Span)
 HTML_OTHER(markupDecl, Span)
 HTML_OTHER(instruction, Span)
-HTML_OTHER(userdefined, Unknown)
diff --git a/mozilla/parser/htmlparser/public/nsHTMLTags.h b/mozilla/parser/htmlparser/public/nsHTMLTags.h
index 9f771ecc307..e826dc6d1c3 100644
--- a/mozilla/parser/htmlparser/public/nsHTMLTags.h
+++ b/mozilla/parser/htmlparser/public/nsHTMLTags.h
@@ -54,6 +54,10 @@ enum nsHTMLTag {
   /* this enum must be first and must be zero */
   eHTMLTag_unknown = 0,
 #include "nsHTMLTagList.h"
+
+  /* can't be moved into nsHTMLTagList since gcc3.4 doesn't like a
+     comma at the end of enum list*/
+  eHTMLTag_userdefined
 };
 #undef HTML_TAG
 #undef HTML_OTHER