Rearranging some includes to fix solaris bustage (50876). code=harishd,waterson, r=mcafee, a=leaf

git-svn-id: svn://10.0.0.236/trunk@77776 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/parser/htmlparser/tests/outsinks/Convert.cpp

@@ -22,16 +22,31 @@
 
 #include <ctype.h>      // for isdigit()
 
+#include "CNavDTD.h"
 #include "nsParserCIID.h"
 #include "nsIParser.h"
-#include "nsHTMLContentSinkStream.h"
+#include "nsIHTMLContentSink.h"
 #include "nsHTMLToTXTSinkStream.h"
+#include "nsHTMLContentSinkStream.h"
 #include "nsIComponentManager.h"
-#include "CNavDTD.h"
-#include "nsXIFDTD.h"
 
 extern "C" void NS_SetupRegistry();
 
+// This is copied from the header files so that we don't accidentally
+// include nsHTMLTokens.h and get all the inline junk that confuses
+// gcc-2.7.2.3.
+
+inline nsresult NS_NewXIFDTD(nsIDTD** aInstancePtrResult)
+{
+  NS_DEFINE_CID(kXIFDTDCID, NS_XIF_DTD_CID);
+  return nsComponentManager::CreateInstance(kXIFDTDCID,
+                                            nsnull,
+                                            NS_GET_IID(nsIDTD),
+                                            (void**)aInstancePtrResult);
+}
+
+
+
 #ifdef XP_PC
 #define PARSER_DLL "gkparser.dll"
 #endif