Bug 170985 : fix for gcc3.4 bustage

git-svn-id: svn://10.0.0.236/trunk@147226 18797224-902f-48f8-a5cc-f745e15eee43
2003-09-24 07:30:16 +00:00
parent 403a6ec735
commit 3dd9b150e5
5 changed files with 10 additions and 3 deletions
--- 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;

--- 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)
--- 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
--- 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)
--- 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