From 530b27f3405f4475a09ccf781e0083dcfedaa9f0 Mon Sep 17 00:00:00 2001 From: "mcafee%netscape.com" Date: Thu, 31 Aug 2000 17:23:22 +0000 Subject: [PATCH] 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/htmlparser/src/CNavDTD.h | 2 +- .../src/nsHTMLContentSinkStream.cpp | 1 + .../htmlparser/src/nsHTMLContentSinkStream.h | 2 +- mozilla/htmlparser/src/nsHTMLTags.h | 2 ++ .../htmlparser/src/nsHTMLToTXTSinkStream.h | 1 - mozilla/htmlparser/src/nsHTMLTokens.h | 2 -- mozilla/htmlparser/tests/outsinks/Convert.cpp | 21 ++++++++++++++++--- mozilla/parser/htmlparser/src/CNavDTD.h | 2 +- .../src/nsHTMLContentSinkStream.cpp | 1 + .../htmlparser/src/nsHTMLContentSinkStream.h | 2 +- mozilla/parser/htmlparser/src/nsHTMLTags.h | 2 ++ .../htmlparser/src/nsHTMLToTXTSinkStream.h | 1 - mozilla/parser/htmlparser/src/nsHTMLTokens.h | 2 -- .../htmlparser/tests/outsinks/Convert.cpp | 21 ++++++++++++++++--- 14 files changed, 46 insertions(+), 16 deletions(-) diff --git a/mozilla/htmlparser/src/CNavDTD.h b/mozilla/htmlparser/src/CNavDTD.h index 0f365d9a2c6..10cd47e6a91 100644 --- a/mozilla/htmlparser/src/CNavDTD.h +++ b/mozilla/htmlparser/src/CNavDTD.h @@ -85,7 +85,7 @@ #include "nsIDTD.h" #include "nsISupports.h" #include "nsIParser.h" -#include "nsHTMLTokens.h" +#include "nsHTMLTags.h" #include "nshtmlpars.h" #include "nsVoidArray.h" #include "nsDeque.h" diff --git a/mozilla/htmlparser/src/nsHTMLContentSinkStream.cpp b/mozilla/htmlparser/src/nsHTMLContentSinkStream.cpp index d0b8c9ad688..9f0b5ece5eb 100644 --- a/mozilla/htmlparser/src/nsHTMLContentSinkStream.cpp +++ b/mozilla/htmlparser/src/nsHTMLContentSinkStream.cpp @@ -41,6 +41,7 @@ #include "nsCRT.h" #include "nsIDocumentEncoder.h" // for output flags #include "nshtmlpars.h" +#include "nsHTMLTokens.h" #include "nsIOutputStream.h" #include "nsFileStream.h" diff --git a/mozilla/htmlparser/src/nsHTMLContentSinkStream.h b/mozilla/htmlparser/src/nsHTMLContentSinkStream.h index 8f921e4009e..9cca0caa7a3 100644 --- a/mozilla/htmlparser/src/nsHTMLContentSinkStream.h +++ b/mozilla/htmlparser/src/nsHTMLContentSinkStream.h @@ -46,7 +46,7 @@ #include "nsIHTMLContentSink.h" #include "nsParserCIID.h" #include "nsCOMPtr.h" -#include "nsHTMLTokens.h" // for eHTMLTags +#include "nsHTMLTags.h" #include "nsISaveAsCharset.h" #include "nsIEntityConverter.h" #include "nsIURI.h" diff --git a/mozilla/htmlparser/src/nsHTMLTags.h b/mozilla/htmlparser/src/nsHTMLTags.h index 2b2d0ba8f88..186dbce0d13 100644 --- a/mozilla/htmlparser/src/nsHTMLTags.h +++ b/mozilla/htmlparser/src/nsHTMLTags.h @@ -62,4 +62,6 @@ public: static const char* GetCStringValue(nsHTMLTag aEnum); }; +#define eHTMLTags nsHTMLTag + #endif /* nsHTMLTags_h___ */ diff --git a/mozilla/htmlparser/src/nsHTMLToTXTSinkStream.h b/mozilla/htmlparser/src/nsHTMLToTXTSinkStream.h index b608bb7e8e4..413934c40c0 100644 --- a/mozilla/htmlparser/src/nsHTMLToTXTSinkStream.h +++ b/mozilla/htmlparser/src/nsHTMLToTXTSinkStream.h @@ -46,7 +46,6 @@ #include "nsHTMLTags.h" #include "nsParserCIID.h" #include "nsCOMPtr.h" -#include "nsHTMLTokens.h" // for eHTMLTags class nsIDTD; diff --git a/mozilla/htmlparser/src/nsHTMLTokens.h b/mozilla/htmlparser/src/nsHTMLTokens.h index 141cbf6c95c..d8b87a60b0e 100644 --- a/mozilla/htmlparser/src/nsHTMLTokens.h +++ b/mozilla/htmlparser/src/nsHTMLTokens.h @@ -83,8 +83,6 @@ enum eHTMLCategory { }; -#define eHTMLTags nsHTMLTag - nsresult ConsumeQuotedString(PRUnichar aChar,nsString& aString,nsScanner& aScanner); nsresult ConsumeAttributeText(PRUnichar aChar,nsString& aString,nsScanner& aScanner); const char* GetTagName(PRInt32 aTag); diff --git a/mozilla/htmlparser/tests/outsinks/Convert.cpp b/mozilla/htmlparser/tests/outsinks/Convert.cpp index eeb112a2df0..5da25adf4b9 100644 --- a/mozilla/htmlparser/tests/outsinks/Convert.cpp +++ b/mozilla/htmlparser/tests/outsinks/Convert.cpp @@ -22,16 +22,31 @@ #include // 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 diff --git a/mozilla/parser/htmlparser/src/CNavDTD.h b/mozilla/parser/htmlparser/src/CNavDTD.h index 0f365d9a2c6..10cd47e6a91 100644 --- a/mozilla/parser/htmlparser/src/CNavDTD.h +++ b/mozilla/parser/htmlparser/src/CNavDTD.h @@ -85,7 +85,7 @@ #include "nsIDTD.h" #include "nsISupports.h" #include "nsIParser.h" -#include "nsHTMLTokens.h" +#include "nsHTMLTags.h" #include "nshtmlpars.h" #include "nsVoidArray.h" #include "nsDeque.h" diff --git a/mozilla/parser/htmlparser/src/nsHTMLContentSinkStream.cpp b/mozilla/parser/htmlparser/src/nsHTMLContentSinkStream.cpp index d0b8c9ad688..9f0b5ece5eb 100644 --- a/mozilla/parser/htmlparser/src/nsHTMLContentSinkStream.cpp +++ b/mozilla/parser/htmlparser/src/nsHTMLContentSinkStream.cpp @@ -41,6 +41,7 @@ #include "nsCRT.h" #include "nsIDocumentEncoder.h" // for output flags #include "nshtmlpars.h" +#include "nsHTMLTokens.h" #include "nsIOutputStream.h" #include "nsFileStream.h" diff --git a/mozilla/parser/htmlparser/src/nsHTMLContentSinkStream.h b/mozilla/parser/htmlparser/src/nsHTMLContentSinkStream.h index 8f921e4009e..9cca0caa7a3 100644 --- a/mozilla/parser/htmlparser/src/nsHTMLContentSinkStream.h +++ b/mozilla/parser/htmlparser/src/nsHTMLContentSinkStream.h @@ -46,7 +46,7 @@ #include "nsIHTMLContentSink.h" #include "nsParserCIID.h" #include "nsCOMPtr.h" -#include "nsHTMLTokens.h" // for eHTMLTags +#include "nsHTMLTags.h" #include "nsISaveAsCharset.h" #include "nsIEntityConverter.h" #include "nsIURI.h" diff --git a/mozilla/parser/htmlparser/src/nsHTMLTags.h b/mozilla/parser/htmlparser/src/nsHTMLTags.h index 2b2d0ba8f88..186dbce0d13 100644 --- a/mozilla/parser/htmlparser/src/nsHTMLTags.h +++ b/mozilla/parser/htmlparser/src/nsHTMLTags.h @@ -62,4 +62,6 @@ public: static const char* GetCStringValue(nsHTMLTag aEnum); }; +#define eHTMLTags nsHTMLTag + #endif /* nsHTMLTags_h___ */ diff --git a/mozilla/parser/htmlparser/src/nsHTMLToTXTSinkStream.h b/mozilla/parser/htmlparser/src/nsHTMLToTXTSinkStream.h index b608bb7e8e4..413934c40c0 100644 --- a/mozilla/parser/htmlparser/src/nsHTMLToTXTSinkStream.h +++ b/mozilla/parser/htmlparser/src/nsHTMLToTXTSinkStream.h @@ -46,7 +46,6 @@ #include "nsHTMLTags.h" #include "nsParserCIID.h" #include "nsCOMPtr.h" -#include "nsHTMLTokens.h" // for eHTMLTags class nsIDTD; diff --git a/mozilla/parser/htmlparser/src/nsHTMLTokens.h b/mozilla/parser/htmlparser/src/nsHTMLTokens.h index 141cbf6c95c..d8b87a60b0e 100644 --- a/mozilla/parser/htmlparser/src/nsHTMLTokens.h +++ b/mozilla/parser/htmlparser/src/nsHTMLTokens.h @@ -83,8 +83,6 @@ enum eHTMLCategory { }; -#define eHTMLTags nsHTMLTag - nsresult ConsumeQuotedString(PRUnichar aChar,nsString& aString,nsScanner& aScanner); nsresult ConsumeAttributeText(PRUnichar aChar,nsString& aString,nsScanner& aScanner); const char* GetTagName(PRInt32 aTag); diff --git a/mozilla/parser/htmlparser/tests/outsinks/Convert.cpp b/mozilla/parser/htmlparser/tests/outsinks/Convert.cpp index eeb112a2df0..5da25adf4b9 100644 --- a/mozilla/parser/htmlparser/tests/outsinks/Convert.cpp +++ b/mozilla/parser/htmlparser/tests/outsinks/Convert.cpp @@ -22,16 +22,31 @@ #include // 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