Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-28 15:23:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move function prototypes into RDFContentSinkImpl class to appease mingw gcc.

Browse Source 
Make gContainerInfo struct local to the only function that uses it.
Bug #134113 r=rjc sr=alecf
This commit is contained in:
cls%seawood.org 2003-03-12 08:26:03 +00:00
parent 2063c40516
commit e518db1521
1 changed files with 26 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
rdf/base/src/nsRDFContentSink.cpp
View File

@ -193,6 +193,24 @@ public:
static nsIAtom* kXMLNSAtom;
static nsIAtom* kParseTypeAtom;
typedef nsresult
NS_STDCALL_FUNCPROTO(nsIRDFContainerUtils::*nsContainerTestFn,
(nsIRDFDataSource* aDataSource,
nsIRDFResource* aResource,
PRBool* aResult));
typedef nsresult
NS_STDCALL_FUNCPROTO(nsIRDFContainerUtils::*nsMakeContainerFn,
(nsIRDFDataSource* aDataSource,
nsIRDFResource* aContainer,
nsIRDFContainer** aResult));
typedef struct ContainerInfo {
nsIRDFResource** mType;
nsContainerTestFn mTestFn;
nsMakeContainerFn mMakeFn;
} ContainerInfo;
protected:
// Text management
void ParseText(nsIRDFNode **aResult);
@ -1498,36 +1516,6 @@ RDFContentSinkImpl::ParseAttributeString(const nsAString& aAttributeName,
return NS_OK;
}
// XXX Wish there was a better macro in nsCom.h...
#if defined(XP_WIN)
#define STDCALL __stdcall
#elif defined(XP_OS2)
#define STDCALL
#else
#define STDCALL
#endif
typedef nsresult (STDCALL nsIRDFContainerUtils::*nsContainerTestFn)(nsIRDFDataSource* aDataSource,
nsIRDFResource* aResource,
PRBool* aResult);
typedef nsresult (STDCALL nsIRDFContainerUtils::*nsMakeContainerFn)(nsIRDFDataSource* aDataSource,
nsIRDFResource* aContainer,
nsIRDFContainer** aResult);
struct ContainerInfo {
nsIRDFResource** mType;
nsContainerTestFn mTestFn;
nsMakeContainerFn mMakeFn;
};
ContainerInfo gContainerInfo[] = {
{ &RDFContentSinkImpl::kRDF_Alt, &nsIRDFContainerUtils::IsAlt, &nsIRDFContainerUtils::MakeAlt },
{ &RDFContentSinkImpl::kRDF_Bag, &nsIRDFContainerUtils::IsBag, &nsIRDFContainerUtils::MakeBag },
{ &RDFContentSinkImpl::kRDF_Seq, &nsIRDFContainerUtils::IsSeq, &nsIRDFContainerUtils::MakeSeq },
{ 0, 0, 0 },
};
nsresult
RDFContentSinkImpl::InitContainer(nsIRDFResource* aContainerType, nsIRDFResource* aContainer)
{
@ -1536,7 +1524,14 @@ RDFContentSinkImpl::InitContainer(nsIRDFResource* aContainerType, nsIRDFResource
// new container vs. 'reinitialize' the container).
nsresult rv;
for (ContainerInfo* info = gContainerInfo; info->mType != 0; ++info) {
static const ContainerInfo gContainerInfo[] = {
{ &RDFContentSinkImpl::kRDF_Alt, &nsIRDFContainerUtils::IsAlt, &nsIRDFContainerUtils::MakeAlt },
{ &RDFContentSinkImpl::kRDF_Bag, &nsIRDFContainerUtils::IsBag, &nsIRDFContainerUtils::MakeBag },
{ &RDFContentSinkImpl::kRDF_Seq, &nsIRDFContainerUtils::IsSeq, &nsIRDFContainerUtils::MakeSeq },
{ 0, 0, 0 },
};
for (const ContainerInfo* info = gContainerInfo; info->mType != 0; ++info) {
if (*info->mType != aContainerType)
continue;