зеркало из https://github.com/mozilla/gecko-dev.git
Fix build on gcc 3.4 by removing extra semicolons (bug 218551). r/sr=dbaron, a=brendan.
This commit is contained in:
Родитель
63fa99c65e
Коммит
377bfd51dd
|
@ -210,7 +210,7 @@ CompositeEnumeratorImpl::~CompositeEnumeratorImpl(void)
|
|||
|
||||
NS_IMPL_ADDREF(CompositeEnumeratorImpl)
|
||||
NS_IMPL_RELEASE_WITH_DESTROY(CompositeEnumeratorImpl, Destroy())
|
||||
NS_IMPL_QUERY_INTERFACE1(CompositeEnumeratorImpl, nsISimpleEnumerator);
|
||||
NS_IMPL_QUERY_INTERFACE1(CompositeEnumeratorImpl, nsISimpleEnumerator)
|
||||
|
||||
NS_IMETHODIMP
|
||||
CompositeEnumeratorImpl::HasMoreElements(PRBool* aResult)
|
||||
|
@ -646,7 +646,7 @@ CompositeDataSourceImpl::CompositeDataSourceImpl(void)
|
|||
// nsISupports interface
|
||||
//
|
||||
|
||||
NS_IMPL_THREADSAFE_ADDREF(CompositeDataSourceImpl);
|
||||
NS_IMPL_THREADSAFE_ADDREF(CompositeDataSourceImpl)
|
||||
|
||||
NS_IMETHODIMP_(nsrefcnt)
|
||||
CompositeDataSourceImpl::Release()
|
||||
|
|
|
@ -465,8 +465,8 @@ RDFContentSinkImpl::~RDFContentSinkImpl()
|
|||
////////////////////////////////////////////////////////////////////////
|
||||
// nsISupports interface
|
||||
|
||||
NS_IMPL_ADDREF(RDFContentSinkImpl);
|
||||
NS_IMPL_RELEASE(RDFContentSinkImpl);
|
||||
NS_IMPL_ADDREF(RDFContentSinkImpl)
|
||||
NS_IMPL_RELEASE(RDFContentSinkImpl)
|
||||
|
||||
NS_IMETHODIMP
|
||||
RDFContentSinkImpl::QueryInterface(REFNSIID iid, void** result)
|
||||
|
|
|
@ -580,8 +580,8 @@ LiteralImpl::~LiteralImpl()
|
|||
NS_RELEASE2(gRDFService, refcnt);
|
||||
}
|
||||
|
||||
NS_IMPL_THREADSAFE_ADDREF(LiteralImpl);
|
||||
NS_IMPL_THREADSAFE_RELEASE(LiteralImpl);
|
||||
NS_IMPL_THREADSAFE_ADDREF(LiteralImpl)
|
||||
NS_IMPL_THREADSAFE_RELEASE(LiteralImpl)
|
||||
|
||||
nsresult
|
||||
LiteralImpl::QueryInterface(REFNSIID iid, void** result)
|
||||
|
@ -682,8 +682,8 @@ DateImpl::~DateImpl()
|
|||
NS_RELEASE2(gRDFService, refcnt);
|
||||
}
|
||||
|
||||
NS_IMPL_ADDREF(DateImpl);
|
||||
NS_IMPL_RELEASE(DateImpl);
|
||||
NS_IMPL_ADDREF(DateImpl)
|
||||
NS_IMPL_RELEASE(DateImpl)
|
||||
|
||||
nsresult
|
||||
DateImpl::QueryInterface(REFNSIID iid, void** result)
|
||||
|
@ -788,8 +788,8 @@ IntImpl::~IntImpl()
|
|||
NS_RELEASE2(gRDFService, refcnt);
|
||||
}
|
||||
|
||||
NS_IMPL_ADDREF(IntImpl);
|
||||
NS_IMPL_RELEASE(IntImpl);
|
||||
NS_IMPL_ADDREF(IntImpl)
|
||||
NS_IMPL_RELEASE(IntImpl)
|
||||
|
||||
nsresult
|
||||
IntImpl::QueryInterface(REFNSIID iid, void** result)
|
||||
|
|
|
@ -204,7 +204,7 @@ public:
|
|||
}
|
||||
};
|
||||
|
||||
NS_IMPL_ISUPPORTS1(ProxyStream, nsIInputStream);
|
||||
NS_IMPL_ISUPPORTS1(ProxyStream, nsIInputStream)
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
//
|
||||
|
@ -537,7 +537,7 @@ NS_IMPL_ISUPPORTS6(RDFXMLDataSourceImpl,
|
|||
nsIRDFXMLSink,
|
||||
nsIRDFXMLSource,
|
||||
nsIRequestObserver,
|
||||
nsIStreamListener);
|
||||
nsIStreamListener)
|
||||
|
||||
|
||||
nsresult
|
||||
|
|
|
@ -180,4 +180,4 @@ static const nsModuleComponentInfo components[] =
|
|||
NS_LOCALSTORE_CONTRACTID, NS_NewLocalStore },
|
||||
};
|
||||
|
||||
NS_IMPL_NSGETMODULE(nsRDFModule, components);
|
||||
NS_IMPL_NSGETMODULE(nsRDFModule, components)
|
||||
|
|
|
@ -65,5 +65,5 @@ static const nsModuleComponentInfo components[] =
|
|||
}
|
||||
};
|
||||
|
||||
NS_IMPL_NSGETMODULE(nsChromeModule, components);
|
||||
NS_IMPL_NSGETMODULE(nsChromeModule, components)
|
||||
|
||||
|
|
|
@ -165,7 +165,7 @@ PRLogModuleInfo* nsCachedChromeChannel::gLog;
|
|||
|
||||
NS_IMPL_ISUPPORTS2(nsCachedChromeChannel,
|
||||
nsIChannel,
|
||||
nsIRequest);
|
||||
nsIRequest)
|
||||
|
||||
nsresult
|
||||
nsCachedChromeChannel::Create(nsIURI* aURI, nsIChannel** aResult)
|
||||
|
@ -512,7 +512,7 @@ nsChromeProtocolHandler::~nsChromeProtocolHandler()
|
|||
{
|
||||
}
|
||||
|
||||
NS_IMPL_THREADSAFE_ISUPPORTS2(nsChromeProtocolHandler, nsIProtocolHandler, nsISupportsWeakReference);
|
||||
NS_IMPL_THREADSAFE_ISUPPORTS2(nsChromeProtocolHandler, nsIProtocolHandler, nsISupportsWeakReference)
|
||||
|
||||
NS_METHOD
|
||||
nsChromeProtocolHandler::Create(nsISupports *aOuter, REFNSIID aIID, void **aResult)
|
||||
|
|
|
@ -309,7 +309,7 @@ nsChromeRegistry::~nsChromeRegistry()
|
|||
|
||||
}
|
||||
|
||||
NS_IMPL_THREADSAFE_ISUPPORTS4(nsChromeRegistry, nsIChromeRegistry, nsIXULChromeRegistry, nsIObserver, nsISupportsWeakReference);
|
||||
NS_IMPL_THREADSAFE_ISUPPORTS4(nsChromeRegistry, nsIChromeRegistry, nsIXULChromeRegistry, nsIObserver, nsISupportsWeakReference)
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
// nsIChromeRegistry methods:
|
||||
|
|
|
@ -281,8 +281,8 @@ NS_NewLocalStore(nsISupports* aOuter, REFNSIID aIID, void** aResult)
|
|||
|
||||
// nsISupports interface
|
||||
|
||||
NS_IMPL_ADDREF(LocalStoreImpl);
|
||||
NS_IMPL_RELEASE(LocalStoreImpl);
|
||||
NS_IMPL_ADDREF(LocalStoreImpl)
|
||||
NS_IMPL_RELEASE(LocalStoreImpl)
|
||||
|
||||
NS_IMETHODIMP
|
||||
LocalStoreImpl::QueryInterface(REFNSIID aIID, void** aResult)
|
||||
|
|
|
@ -163,7 +163,7 @@ NS_IMPL_ISUPPORTS6(nsSecureBrowserUIImpl,
|
|||
nsIFormSubmitObserver,
|
||||
nsIObserver,
|
||||
nsISupportsWeakReference,
|
||||
nsISSLStatusProvider);
|
||||
nsISSLStatusProvider)
|
||||
|
||||
|
||||
NS_IMETHODIMP
|
||||
|
|
|
@ -31,7 +31,7 @@
|
|||
#include "nsIInterfaceRequestor.h"
|
||||
#include "nsIInterfaceRequestorUtils.h"
|
||||
|
||||
NS_IMPL_THREADSAFE_ISUPPORTS1(nsSecurityWarningDialogs, nsISecurityWarningDialogs);
|
||||
NS_IMPL_THREADSAFE_ISUPPORTS1(nsSecurityWarningDialogs, nsISecurityWarningDialogs)
|
||||
|
||||
static NS_DEFINE_CID(kPrefCID, NS_PREF_CID);
|
||||
static NS_DEFINE_CID(kCStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID);
|
||||
|
|
|
@ -38,7 +38,7 @@
|
|||
#include "nsArray.h"
|
||||
|
||||
NS_IMPL_THREADSAFE_ISUPPORTS2(nsNSSASN1Tree, nsIASN1Tree,
|
||||
nsITreeView);
|
||||
nsITreeView)
|
||||
|
||||
nsNSSASN1Tree::nsNSSASN1Tree()
|
||||
:mTopNode(nsnull)
|
||||
|
|
|
@ -73,7 +73,7 @@ NS_IMPL_THREADSAFE_ISUPPORTS8(nsNSSDialogs, nsITokenPasswordDialogs,
|
|||
nsICertPickDialogs,
|
||||
nsITokenDialogs,
|
||||
nsIDOMCryptoDialogs,
|
||||
nsIGeneratingKeypairInfoDialogs);
|
||||
nsIGeneratingKeypairInfoDialogs)
|
||||
|
||||
nsresult
|
||||
nsNSSDialogs::Init()
|
||||
|
|
|
@ -160,7 +160,7 @@ done:
|
|||
return primeBits;
|
||||
}
|
||||
|
||||
NS_IMPL_THREADSAFE_ISUPPORTS1(nsKeygenFormProcessor, nsIFormProcessor);
|
||||
NS_IMPL_THREADSAFE_ISUPPORTS1(nsKeygenFormProcessor, nsIFormProcessor)
|
||||
MOZ_DECL_CTOR_COUNTER(nsKeygenFormProcessor)
|
||||
|
||||
nsKeygenFormProcessor::nsKeygenFormProcessor()
|
||||
|
|
|
@ -39,9 +39,9 @@
|
|||
#include "nsXPCOMCID.h"
|
||||
|
||||
NS_IMPL_THREADSAFE_ISUPPORTS2(nsNSSASN1Sequence, nsIASN1Sequence,
|
||||
nsIASN1Object);
|
||||
nsIASN1Object)
|
||||
NS_IMPL_THREADSAFE_ISUPPORTS2(nsNSSASN1PrintableItem, nsIASN1PrintableItem,
|
||||
nsIASN1Object);
|
||||
nsIASN1Object)
|
||||
|
||||
// This function is used to interpret an integer that
|
||||
// was encoded in a DER buffer. This function is used
|
||||
|
|
|
@ -109,7 +109,7 @@ nsSSLStatus::nsSSLStatus()
|
|||
{
|
||||
}
|
||||
|
||||
NS_IMPL_THREADSAFE_ISUPPORTS1(nsSSLStatus, nsISSLStatus);
|
||||
NS_IMPL_THREADSAFE_ISUPPORTS1(nsSSLStatus, nsISSLStatus)
|
||||
|
||||
nsSSLStatus::~nsSSLStatus()
|
||||
{
|
||||
|
|
|
@ -1320,7 +1320,7 @@ NS_IMPL_THREADSAFE_ISUPPORTS5(nsNSSComponent,
|
|||
nsIEntropyCollector,
|
||||
nsINSSComponent,
|
||||
nsIObserver,
|
||||
nsISupportsWeakReference);
|
||||
nsISupportsWeakReference)
|
||||
|
||||
//---------------------------------------------
|
||||
// Functions Implementing nsISignatureVerifier
|
||||
|
@ -2188,7 +2188,7 @@ getPSMContentType(const char * aContentType)
|
|||
|
||||
NS_IMPL_ISUPPORTS2(PSMContentListener,
|
||||
nsIURIContentListener,
|
||||
nsISupportsWeakReference);
|
||||
nsISupportsWeakReference)
|
||||
|
||||
PSMContentListener::PSMContentListener()
|
||||
{
|
||||
|
|
|
@ -382,4 +382,4 @@ static const nsModuleComponentInfo components[] =
|
|||
}
|
||||
};
|
||||
|
||||
NS_IMPL_NSGETMODULE(NSS, components);
|
||||
NS_IMPL_NSGETMODULE(NSS, components)
|
||||
|
|
|
@ -33,7 +33,7 @@ nsSSLSocketProvider::~nsSSLSocketProvider()
|
|||
}
|
||||
|
||||
NS_IMPL_THREADSAFE_ISUPPORTS2(nsSSLSocketProvider, nsISocketProvider,
|
||||
nsISSLSocketProvider);
|
||||
nsISSLSocketProvider)
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsSSLSocketProvider::NewSocket(const char *host,
|
||||
|
|
|
@ -33,7 +33,7 @@ nsTLSSocketProvider::~nsTLSSocketProvider()
|
|||
}
|
||||
|
||||
NS_IMPL_THREADSAFE_ISUPPORTS2(nsTLSSocketProvider, nsISocketProvider,
|
||||
nsISSLSocketProvider);
|
||||
nsISSLSocketProvider)
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsTLSSocketProvider::NewSocket(const char *host,
|
||||
|
|
|
@ -50,7 +50,7 @@
|
|||
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsAutoCompleteController)
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsAutoCompleteMdbResult)
|
||||
NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(nsFormHistory, nsFormHistory::GetInstance);
|
||||
NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(nsFormHistory, nsFormHistory::GetInstance)
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsFormFillController)
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGlobalHistory, Init)
|
||||
NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(nsPasswordManager, nsPasswordManager::GetInstance)
|
||||
|
|
|
@ -447,7 +447,7 @@ nsMdbTableEnumerator::~nsMdbTableEnumerator()
|
|||
}
|
||||
|
||||
|
||||
NS_IMPL_ISUPPORTS1(nsMdbTableEnumerator, nsISimpleEnumerator);
|
||||
NS_IMPL_ISUPPORTS1(nsMdbTableEnumerator, nsISimpleEnumerator)
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsMdbTableEnumerator::HasMoreElements(PRBool* _result)
|
||||
|
|
|
@ -77,8 +77,8 @@ NS_INTERFACE_MAP_BEGIN(nsFormFillController)
|
|||
NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsIDOMEventListener, nsIDOMFocusListener)
|
||||
NS_INTERFACE_MAP_END
|
||||
|
||||
NS_IMPL_ADDREF(nsFormFillController);
|
||||
NS_IMPL_RELEASE(nsFormFillController);
|
||||
NS_IMPL_ADDREF(nsFormFillController)
|
||||
NS_IMPL_RELEASE(nsFormFillController)
|
||||
|
||||
nsFormFillController::nsFormFillController() :
|
||||
mTimeout(50),
|
||||
|
|
|
@ -66,8 +66,8 @@ NS_INTERFACE_MAP_BEGIN(nsFormHistory)
|
|||
NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIObserver)
|
||||
NS_INTERFACE_MAP_END_THREADSAFE
|
||||
|
||||
NS_IMPL_THREADSAFE_ADDREF(nsFormHistory);
|
||||
NS_IMPL_THREADSAFE_RELEASE(nsFormHistory);
|
||||
NS_IMPL_THREADSAFE_ADDREF(nsFormHistory)
|
||||
NS_IMPL_THREADSAFE_RELEASE(nsFormHistory)
|
||||
|
||||
mdb_column nsFormHistory::kToken_ValueColumn = 0;
|
||||
mdb_column nsFormHistory::kToken_NameColumn = 0;
|
||||
|
|
|
@ -76,7 +76,7 @@ nsXREDirProvider::~nsXREDirProvider()
|
|||
{
|
||||
}
|
||||
|
||||
NS_IMPL_ISUPPORTS1(nsXREDirProvider, nsIDirectoryServiceProvider);
|
||||
NS_IMPL_ISUPPORTS1(nsXREDirProvider, nsIDirectoryServiceProvider)
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsXREDirProvider::GetFile(const char* aProperty, PRBool* aPersistent,
|
||||
|
|
|
@ -124,8 +124,8 @@ protected:
|
|||
PRBool mIsContentPreferred;
|
||||
};
|
||||
|
||||
NS_IMPL_THREADSAFE_ADDREF(nsDocumentOpenInfo);
|
||||
NS_IMPL_THREADSAFE_RELEASE(nsDocumentOpenInfo);
|
||||
NS_IMPL_THREADSAFE_ADDREF(nsDocumentOpenInfo)
|
||||
NS_IMPL_THREADSAFE_RELEASE(nsDocumentOpenInfo)
|
||||
|
||||
NS_INTERFACE_MAP_BEGIN(nsDocumentOpenInfo)
|
||||
NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIRequestObserver)
|
||||
|
@ -531,8 +531,8 @@ nsURILoader::~nsURILoader()
|
|||
{
|
||||
}
|
||||
|
||||
NS_IMPL_ADDREF(nsURILoader);
|
||||
NS_IMPL_RELEASE(nsURILoader);
|
||||
NS_IMPL_ADDREF(nsURILoader)
|
||||
NS_IMPL_RELEASE(nsURILoader)
|
||||
|
||||
NS_INTERFACE_MAP_BEGIN(nsURILoader)
|
||||
NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIURILoader)
|
||||
|
|
|
@ -57,7 +57,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPrefetchService, Init)
|
|||
// Define the constructor functions for the Mac specific objects
|
||||
#if defined(XP_MAC) || defined(XP_MACOSX)
|
||||
#include "nsInternetConfigService.h"
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsInternetConfigService);
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsInternetConfigService)
|
||||
#endif
|
||||
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
|
|
Загрузка…
Ссылка в новой задаче