Bug 170985 : fix for gcc3.4 bustage

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;
 

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)

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

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)

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