Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-04 11:26:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

15777: Don't declare the same function-static symbol twice in the same file, because some versions of gcc can't deal with it. r=mcafee

Browse Source
This commit is contained in:
akkana%netscape.com 1999-10-20 20:20:38 +00:00
parent 64090b2391
commit 5096c0459f
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
content/base/src/nsDocumentEncoder.cpp
View File

@ -38,6 +38,9 @@ static NS_DEFINE_CID(kComponentManagerCID, NS_COMPONENTMANAGER_CID);
static NS_DEFINE_CID(kCTextEncoderCID, NS_TEXT_ENCODER_CID);
static NS_DEFINE_IID(kCParserIID, NS_IPARSER_IID);
static NS_DEFINE_IID(kCParserCID, NS_PARSER_IID);
class nsTextEncoder : public nsIDocumentEncoder
{
public:
@ -175,9 +178,6 @@ nsTextEncoder::EncodeToString(nsString& aOutputString)
nsIParser* parser;
static NS_DEFINE_IID(kCParserIID, NS_IPARSER_IID);
static NS_DEFINE_IID(kCParserCID, NS_PARSER_IID);
rv = nsComponentManager::CreateInstance(kCParserCID,
nsnull,
kCParserIID,
@ -236,9 +236,6 @@ nsTextEncoder::EncodeToStream(nsIOutputStream* aStream)
nsIParser* parser;
static NS_DEFINE_IID(kCParserIID, NS_IPARSER_IID);
static NS_DEFINE_IID(kCParserCID, NS_PARSER_IID);
rv = nsComponentManager::CreateInstance(kCParserCID,
nsnull,
kCParserIID,

9
layout/base/src/nsDocumentEncoder.cpp
View File

@ -38,6 +38,9 @@ static NS_DEFINE_CID(kComponentManagerCID, NS_COMPONENTMANAGER_CID);
static NS_DEFINE_CID(kCTextEncoderCID, NS_TEXT_ENCODER_CID);
static NS_DEFINE_IID(kCParserIID, NS_IPARSER_IID);
static NS_DEFINE_IID(kCParserCID, NS_PARSER_IID);
class nsTextEncoder : public nsIDocumentEncoder
{
public:
@ -175,9 +178,6 @@ nsTextEncoder::EncodeToString(nsString& aOutputString)
nsIParser* parser;
static NS_DEFINE_IID(kCParserIID, NS_IPARSER_IID);
static NS_DEFINE_IID(kCParserCID, NS_PARSER_IID);
rv = nsComponentManager::CreateInstance(kCParserCID,
nsnull,
kCParserIID,
@ -236,9 +236,6 @@ nsTextEncoder::EncodeToStream(nsIOutputStream* aStream)
nsIParser* parser;
static NS_DEFINE_IID(kCParserIID, NS_IPARSER_IID);
static NS_DEFINE_IID(kCParserCID, NS_PARSER_IID);
rv = nsComponentManager::CreateInstance(kCParserCID,
nsnull,
kCParserIID,