mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-26 06:11:37 +00:00
Patch #2 to get solaris building (50876). code=harishd, r=jst,mcafee, a=heikki
This commit is contained in:
mcafee%netscape.com
parent
55a6cd74f5
commit
ea69132ff3
@ -452,7 +452,7 @@ nsresult nsXIFDTD::DidBuildModel(nsresult anErrorCode,PRBool aNotifySink,nsIPars
|
||||
* @return
|
||||
*/
|
||||
|
||||
nsresult nsXIFDTD::WillHandleToken(CToken* aToken,eHTMLTokenTypes& aType) {
|
||||
nsresult nsXIFDTD::WillHandleToken(CToken* aToken,PRInt32& aType) {
|
||||
NS_ASSERTION(aToken!=nsnull,"invalid token");
|
||||
|
||||
if(aToken) {
|
||||
@ -486,7 +486,7 @@ nsresult nsXIFDTD::HandleToken(CToken* aToken,nsIParser* aParser){
|
||||
|
||||
if(aToken) {
|
||||
|
||||
eHTMLTokenTypes theType=eToken_unknown;
|
||||
PRInt32 theType=eToken_unknown;
|
||||
result=WillHandleToken(aToken,theType);
|
||||
|
||||
if(result==NS_OK) {
|
||||
|
||||
@ -37,9 +37,9 @@
|
||||
#include "nshtmlpars.h"
|
||||
#include "nsIDTD.h"
|
||||
#include "nsIContentSink.h"
|
||||
#include "nsHTMLTokens.h"
|
||||
#include "nsVoidArray.h"
|
||||
#include "nsParserCIID.h"
|
||||
#include "nsHTMLTags.h"
|
||||
|
||||
|
||||
class nsParser;
|
||||
@ -53,6 +53,7 @@ class nsEntryStack;
|
||||
class nsCParserNode;
|
||||
class nsTokenAllocator;
|
||||
class CNodeRecycler;
|
||||
class CToken;
|
||||
|
||||
//*** This enum is used to define the known universe of XIF tags.
|
||||
//*** The use of this table doesn't preclude of from using non-standard
|
||||
@ -339,12 +340,6 @@ private:
|
||||
void InitializeDefaultTokenHandlers();
|
||||
|
||||
|
||||
/**
|
||||
* DEPRECATED
|
||||
* @update gpk 06/18/98
|
||||
*/
|
||||
CTokenHandler* GetTokenHandler(eHTMLTokenTypes aType) const;
|
||||
|
||||
/**
|
||||
* DEPRECATED
|
||||
* @update gpk 06/18/98
|
||||
@ -419,7 +414,7 @@ private:
|
||||
|
||||
protected:
|
||||
|
||||
nsresult WillHandleToken(CToken* aToken,eHTMLTokenTypes& aType);
|
||||
nsresult WillHandleToken(CToken* aToken,PRInt32& aType);
|
||||
nsresult DidHandleToken(CToken* aToken, nsresult aResult=NS_OK);
|
||||
nsresult WillHandleStartToken(CToken* aToken,eXIFTags aTag, nsIParserNode& aNode);
|
||||
nsresult DidHandleStartToken(CToken* aToken,eXIFTags aTag, nsIParserNode& aNode);
|
||||
|
||||
@ -23,6 +23,7 @@
|
||||
#include <ctype.h> // for isdigit()
|
||||
|
||||
#include "CNavDTD.h"
|
||||
#include "nsXIFDTD.h"
|
||||
#include "nsParserCIID.h"
|
||||
#include "nsIParser.h"
|
||||
#include "nsIHTMLContentSink.h"
|
||||
@ -32,21 +33,6 @@
|
||||
|
||||
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
|
||||
|
||||
@ -452,7 +452,7 @@ nsresult nsXIFDTD::DidBuildModel(nsresult anErrorCode,PRBool aNotifySink,nsIPars
|
||||
* @return
|
||||
*/
|
||||
|
||||
nsresult nsXIFDTD::WillHandleToken(CToken* aToken,eHTMLTokenTypes& aType) {
|
||||
nsresult nsXIFDTD::WillHandleToken(CToken* aToken,PRInt32& aType) {
|
||||
NS_ASSERTION(aToken!=nsnull,"invalid token");
|
||||
|
||||
if(aToken) {
|
||||
@ -486,7 +486,7 @@ nsresult nsXIFDTD::HandleToken(CToken* aToken,nsIParser* aParser){
|
||||
|
||||
if(aToken) {
|
||||
|
||||
eHTMLTokenTypes theType=eToken_unknown;
|
||||
PRInt32 theType=eToken_unknown;
|
||||
result=WillHandleToken(aToken,theType);
|
||||
|
||||
if(result==NS_OK) {
|
||||
|
||||
@ -37,9 +37,9 @@
|
||||
#include "nshtmlpars.h"
|
||||
#include "nsIDTD.h"
|
||||
#include "nsIContentSink.h"
|
||||
#include "nsHTMLTokens.h"
|
||||
#include "nsVoidArray.h"
|
||||
#include "nsParserCIID.h"
|
||||
#include "nsHTMLTags.h"
|
||||
|
||||
|
||||
class nsParser;
|
||||
@ -53,6 +53,7 @@ class nsEntryStack;
|
||||
class nsCParserNode;
|
||||
class nsTokenAllocator;
|
||||
class CNodeRecycler;
|
||||
class CToken;
|
||||
|
||||
//*** This enum is used to define the known universe of XIF tags.
|
||||
//*** The use of this table doesn't preclude of from using non-standard
|
||||
@ -339,12 +340,6 @@ private:
|
||||
void InitializeDefaultTokenHandlers();
|
||||
|
||||
|
||||
/**
|
||||
* DEPRECATED
|
||||
* @update gpk 06/18/98
|
||||
*/
|
||||
CTokenHandler* GetTokenHandler(eHTMLTokenTypes aType) const;
|
||||
|
||||
/**
|
||||
* DEPRECATED
|
||||
* @update gpk 06/18/98
|
||||
@ -419,7 +414,7 @@ private:
|
||||
|
||||
protected:
|
||||
|
||||
nsresult WillHandleToken(CToken* aToken,eHTMLTokenTypes& aType);
|
||||
nsresult WillHandleToken(CToken* aToken,PRInt32& aType);
|
||||
nsresult DidHandleToken(CToken* aToken, nsresult aResult=NS_OK);
|
||||
nsresult WillHandleStartToken(CToken* aToken,eXIFTags aTag, nsIParserNode& aNode);
|
||||
nsresult DidHandleStartToken(CToken* aToken,eXIFTags aTag, nsIParserNode& aNode);
|
||||
|
||||
@ -23,6 +23,7 @@
|
||||
#include <ctype.h> // for isdigit()
|
||||
|
||||
#include "CNavDTD.h"
|
||||
#include "nsXIFDTD.h"
|
||||
#include "nsParserCIID.h"
|
||||
#include "nsIParser.h"
|
||||
#include "nsIHTMLContentSink.h"
|
||||
@ -32,21 +33,6 @@
|
||||
|
||||
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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user