зеркало из 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:
bryner%brianryner.com
Родитель
5cd0bcdb7a
Коммит
63fa99c65e
|
|
@ -48,6 +48,6 @@ static const nsModuleComponentInfo components[] =
|
|||
},
|
||||
};
|
||||
|
||||
NS_IMPL_NSGETMODULE(nsJarProtocolModule, components);
|
||||
NS_IMPL_NSGETMODULE(nsJarProtocolModule, components)
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -151,8 +151,8 @@ nsStreamListenerEvent::Fire(nsIEventQueue* aEventQueue)
|
|||
NS_IMPL_THREADSAFE_ISUPPORTS1(nsAsyncStreamObserver,
|
||||
nsIRequestObserver)
|
||||
|
||||
NS_IMPL_ADDREF_INHERITED(nsAsyncStreamListener, nsAsyncStreamObserver);
|
||||
NS_IMPL_RELEASE_INHERITED(nsAsyncStreamListener, nsAsyncStreamObserver);
|
||||
NS_IMPL_ADDREF_INHERITED(nsAsyncStreamListener, nsAsyncStreamObserver)
|
||||
NS_IMPL_RELEASE_INHERITED(nsAsyncStreamListener, nsAsyncStreamObserver)
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsAsyncStreamListener::QueryInterface(REFNSIID aIID, void** aInstancePtr)
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@ nsBufferedStream::~nsBufferedStream()
|
|||
Close();
|
||||
}
|
||||
|
||||
NS_IMPL_THREADSAFE_ISUPPORTS1(nsBufferedStream, nsISeekableStream);
|
||||
NS_IMPL_THREADSAFE_ISUPPORTS1(nsBufferedStream, nsISeekableStream)
|
||||
|
||||
nsresult
|
||||
nsBufferedStream::Init(nsISupports* stream, PRUint32 bufferSize)
|
||||
|
|
|
|||
|
|
@ -256,7 +256,7 @@ nsIOService::~nsIOService()
|
|||
NS_IMPL_THREADSAFE_ISUPPORTS3(nsIOService,
|
||||
nsIIOService,
|
||||
nsIObserver,
|
||||
nsISupportsWeakReference);
|
||||
nsISupportsWeakReference)
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
|
|
|
|||
|
|
@ -214,7 +214,7 @@ nsLoadGroup::Create(nsISupports *aOuter, REFNSIID aIID, void **aResult)
|
|||
////////////////////////////////////////////////////////////////////////////////
|
||||
// nsISupports methods:
|
||||
|
||||
NS_IMPL_AGGREGATED(nsLoadGroup);
|
||||
NS_IMPL_AGGREGATED(nsLoadGroup)
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsLoadGroup::AggregatedQueryInterface(const nsIID& aIID, void** aInstancePtr)
|
||||
|
|
|
|||
|
|
@ -90,7 +90,7 @@ private:
|
|||
NS_IMPL_THREADSAFE_ISUPPORTS3(nsMIMEInputStream,
|
||||
nsIMIMEInputStream,
|
||||
nsIInputStream,
|
||||
nsISeekableStream);
|
||||
nsISeekableStream)
|
||||
|
||||
nsMIMEInputStream::nsMIMEInputStream() : mAddContentLength(PR_FALSE),
|
||||
mStartedReading(PR_FALSE)
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ static NS_DEFINE_IID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID);
|
|||
//////////////////////////////
|
||||
//// nsISupports
|
||||
//////////////////////////////
|
||||
NS_IMPL_THREADSAFE_ISUPPORTS1(nsNetModRegEntry, nsINetModRegEntry);
|
||||
NS_IMPL_THREADSAFE_ISUPPORTS1(nsNetModRegEntry, nsINetModRegEntry)
|
||||
|
||||
|
||||
//////////////////////////////
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ nsNetModuleMgr* nsNetModuleMgr::gManager;
|
|||
//// nsISupports
|
||||
///////////////////////////////////
|
||||
|
||||
NS_IMPL_THREADSAFE_ISUPPORTS1(nsNetModuleMgr, nsINetModuleMgr);
|
||||
NS_IMPL_THREADSAFE_ISUPPORTS1(nsNetModuleMgr, nsINetModuleMgr)
|
||||
|
||||
|
||||
///////////////////////////////////
|
||||
|
|
|
|||
|
|
@ -120,9 +120,9 @@ proxy_GetIntPref(nsIPrefBranch *aPrefBranch,
|
|||
|
||||
NS_IMPL_THREADSAFE_ISUPPORTS2(nsProtocolProxyService,
|
||||
nsIProtocolProxyService,
|
||||
nsIObserver);
|
||||
nsIObserver)
|
||||
NS_IMPL_THREADSAFE_ISUPPORTS1(nsProtocolProxyService::nsProxyInfo,
|
||||
nsIProxyInfo);
|
||||
nsIProxyInfo)
|
||||
|
||||
nsProtocolProxyService::nsProtocolProxyService()
|
||||
: mUseProxy(0)
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@ nsSimpleURI::~nsSimpleURI()
|
|||
{
|
||||
}
|
||||
|
||||
NS_IMPL_AGGREGATED(nsSimpleURI);
|
||||
NS_IMPL_AGGREGATED(nsSimpleURI)
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsSimpleURI::AggregatedQueryInterface(const nsIID& aIID, void** aInstancePtr)
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@
|
|||
//Interfaces for addref, release and queryinterface
|
||||
NS_IMPL_ISUPPORTS5(nsURIChecker, nsIURIChecker,
|
||||
nsIRequest, nsIStreamListener,
|
||||
nsIHttpEventSink, nsIInterfaceRequestor);
|
||||
nsIHttpEventSink, nsIInterfaceRequestor)
|
||||
|
||||
nsURIChecker::nsURIChecker()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -160,7 +160,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsFileProtocolHandler, Init)
|
|||
#ifdef NECKO_PROTOCOL_ftp
|
||||
// ftp
|
||||
#include "nsFtpProtocolHandler.h"
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsFtpProtocolHandler, Init);
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsFtpProtocolHandler, Init)
|
||||
#endif
|
||||
|
||||
#ifdef NECKO_PROTOCOL_http
|
||||
|
|
@ -337,7 +337,7 @@ UnregisterStreamConverters(nsIComponentManager *aCompMgr, nsIFile *aPath,
|
|||
}
|
||||
|
||||
#ifdef BUILD_BINHEX_DECODER
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsBinHexDecoder);
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsBinHexDecoder)
|
||||
#endif
|
||||
|
||||
static NS_IMETHODIMP
|
||||
|
|
|
|||
|
|
@ -297,7 +297,7 @@ nsCacheEntry::DetachDescriptors(void)
|
|||
* nsCacheEntryInfo - for implementing about:cache
|
||||
*****************************************************************************/
|
||||
|
||||
NS_IMPL_ISUPPORTS1(nsCacheEntryInfo, nsICacheEntryInfo);
|
||||
NS_IMPL_ISUPPORTS1(nsCacheEntryInfo, nsICacheEntryInfo)
|
||||
|
||||
|
||||
NS_IMETHODIMP
|
||||
|
|
|
|||
|
|
@ -107,7 +107,7 @@ private:
|
|||
PRInt32 mMemoryCacheCapacity;
|
||||
};
|
||||
|
||||
NS_IMPL_ISUPPORTS1(nsCacheProfilePrefObserver, nsIObserver);
|
||||
NS_IMPL_ISUPPORTS1(nsCacheProfilePrefObserver, nsIObserver)
|
||||
|
||||
|
||||
nsresult
|
||||
|
|
@ -384,7 +384,7 @@ nsCacheProfilePrefObserver::MemoryCacheEnabled()
|
|||
|
||||
nsCacheService * nsCacheService::gService = nsnull;
|
||||
|
||||
NS_IMPL_THREADSAFE_ISUPPORTS1(nsCacheService, nsICacheService);
|
||||
NS_IMPL_THREADSAFE_ISUPPORTS1(nsCacheService, nsICacheService)
|
||||
|
||||
nsCacheService::nsCacheService()
|
||||
: mCacheServiceLock(nsnull),
|
||||
|
|
|
|||
|
|
@ -106,7 +106,7 @@ GetCacheEntryBinding(nsCacheEntry * entry)
|
|||
* nsDiskCacheBinding
|
||||
*****************************************************************************/
|
||||
|
||||
NS_IMPL_THREADSAFE_ISUPPORTS0(nsDiskCacheBinding);
|
||||
NS_IMPL_THREADSAFE_ISUPPORTS0(nsDiskCacheBinding)
|
||||
|
||||
nsDiskCacheBinding::nsDiskCacheBinding(nsCacheEntry* entry, nsDiskCacheRecord * record)
|
||||
: mCacheEntry(entry)
|
||||
|
|
|
|||
|
|
@ -183,7 +183,7 @@ private:
|
|||
nsDiskCacheDevice* mDevice;
|
||||
};
|
||||
|
||||
NS_IMPL_ISUPPORTS1(nsDiskCacheDeviceInfo, nsICacheDeviceInfo);
|
||||
NS_IMPL_ISUPPORTS1(nsDiskCacheDeviceInfo, nsICacheDeviceInfo)
|
||||
|
||||
/* readonly attribute string description; */
|
||||
NS_IMETHODIMP nsDiskCacheDeviceInfo::GetDescription(char ** aDescription)
|
||||
|
|
|
|||
|
|
@ -143,7 +143,7 @@ CreateDiskCacheEntry(nsDiskCacheBinding * binding)
|
|||
* nsDiskCacheEntryInfo
|
||||
*****************************************************************************/
|
||||
|
||||
NS_IMPL_ISUPPORTS1(nsDiskCacheEntryInfo, nsICacheEntryInfo);
|
||||
NS_IMPL_ISUPPORTS1(nsDiskCacheEntryInfo, nsICacheEntryInfo)
|
||||
|
||||
NS_IMETHODIMP nsDiskCacheEntryInfo::GetClientID(char ** clientID)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -503,7 +503,7 @@ nsMemoryCacheDevice::CheckEntryCount()
|
|||
*****************************************************************************/
|
||||
|
||||
|
||||
NS_IMPL_ISUPPORTS1(nsMemoryCacheDeviceInfo, nsICacheDeviceInfo);
|
||||
NS_IMPL_ISUPPORTS1(nsMemoryCacheDeviceInfo, nsICacheDeviceInfo)
|
||||
|
||||
|
||||
NS_IMETHODIMP
|
||||
|
|
|
|||
|
|
@ -371,7 +371,7 @@ ClearEntry(PLDHashTable * /* table */,
|
|||
* nsDNSRequest methods:
|
||||
*****************************************************************************/
|
||||
|
||||
NS_IMPL_THREADSAFE_ISUPPORTS1(nsDNSRequest, nsIRequest);
|
||||
NS_IMPL_THREADSAFE_ISUPPORTS1(nsDNSRequest, nsIRequest)
|
||||
|
||||
|
||||
nsresult
|
||||
|
|
@ -527,7 +527,7 @@ nsDNSRequest::SetLoadFlags(nsLoadFlags loadFlags)
|
|||
#pragma mark nsDNSLookup
|
||||
#endif
|
||||
|
||||
NS_IMPL_THREADSAFE_ISUPPORTS0(nsDNSLookup);
|
||||
NS_IMPL_THREADSAFE_ISUPPORTS0(nsDNSLookup)
|
||||
|
||||
nsDNSLookup::nsDNSLookup()
|
||||
: mHostName(nsnull)
|
||||
|
|
@ -1135,7 +1135,7 @@ nsDNSService::~nsDNSService()
|
|||
}
|
||||
|
||||
|
||||
NS_IMPL_THREADSAFE_ISUPPORTS3(nsDNSService, nsIDNSService, nsIRunnable, nsIObserver);
|
||||
NS_IMPL_THREADSAFE_ISUPPORTS3(nsDNSService, nsIDNSService, nsIRunnable, nsIObserver)
|
||||
|
||||
NS_METHOD
|
||||
nsDNSService::Create(nsISupports* aOuter, const nsIID& aIID, void* *aResult)
|
||||
|
|
@ -1821,7 +1821,7 @@ static unsigned long convert_addr(const char* ip)
|
|||
PL_strfree(buf);
|
||||
}
|
||||
return htonl(addr);
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
NS_IMETHODIMP
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@ static const PRUint32 kMaxDNSNodeLen = 63;
|
|||
NS_IMPL_THREADSAFE_ISUPPORTS3(nsIDNService,
|
||||
nsIIDNService,
|
||||
nsIObserver,
|
||||
nsISupportsWeakReference);
|
||||
nsISupportsWeakReference)
|
||||
|
||||
nsresult nsIDNService::Init()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@
|
|||
#include "nsStringEnumerator.h"
|
||||
|
||||
// nsISupports methods
|
||||
NS_IMPL_THREADSAFE_ISUPPORTS1(nsMIMEInfoImpl, nsIMIMEInfo);
|
||||
NS_IMPL_THREADSAFE_ISUPPORTS1(nsMIMEInfoImpl, nsIMIMEInfo)
|
||||
|
||||
// nsMIMEInfoImpl methods
|
||||
nsMIMEInfoImpl::nsMIMEInfoImpl() {
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@
|
|||
#include "nsIStringStream.h"
|
||||
#include "nsNetUtil.h"
|
||||
|
||||
NS_IMPL_ISUPPORTS1(nsAboutBlank, nsIAboutModule);
|
||||
NS_IMPL_ISUPPORTS1(nsAboutBlank, nsIAboutModule)
|
||||
|
||||
static const char kBlankPage[] = "<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">"
|
||||
"<html><head><title></title></head><body></body></html>";
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@ nsFileProtocolHandler::Init()
|
|||
NS_IMPL_THREADSAFE_ISUPPORTS3(nsFileProtocolHandler,
|
||||
nsIFileProtocolHandler,
|
||||
nsIProtocolHandler,
|
||||
nsISupportsWeakReference);
|
||||
nsISupportsWeakReference)
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// nsIProtocolHandler methods:
|
||||
|
|
|
|||
|
|
@ -54,4 +54,4 @@ static const nsModuleComponentInfo components[] =
|
|||
}
|
||||
};
|
||||
|
||||
NS_IMPL_NSGETMODULE(nsFileProtocolModule, components);
|
||||
NS_IMPL_NSGETMODULE(nsFileProtocolModule, components)
|
||||
|
|
|
|||
|
|
@ -359,7 +359,7 @@ DataRequestForwarder::OnTransportStatus(nsITransport *transport, nsresult status
|
|||
NS_IMPL_THREADSAFE_ISUPPORTS3(nsFtpState,
|
||||
nsIStreamListener,
|
||||
nsIRequestObserver,
|
||||
nsIRequest);
|
||||
nsIRequest)
|
||||
|
||||
nsFtpState::nsFtpState()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ static NS_DEFINE_CID(kSocketTransportServiceCID, NS_SOCKETTRANSPORTSERVICE_CID);
|
|||
|
||||
NS_IMPL_THREADSAFE_ISUPPORTS2(nsFtpControlConnection,
|
||||
nsIStreamListener,
|
||||
nsIRequestObserver);
|
||||
nsIRequestObserver)
|
||||
|
||||
nsFtpControlConnection::nsFtpControlConnection(const char* host,
|
||||
PRUint32 port)
|
||||
|
|
|
|||
|
|
@ -104,7 +104,7 @@ NS_IMPL_THREADSAFE_ISUPPORTS4(nsFtpProtocolHandler,
|
|||
nsIProtocolHandler,
|
||||
nsIProxiedProtocolHandler,
|
||||
nsIObserver,
|
||||
nsISupportsWeakReference);
|
||||
nsISupportsWeakReference)
|
||||
|
||||
nsresult
|
||||
nsFtpProtocolHandler::Init()
|
||||
|
|
|
|||
|
|
@ -80,7 +80,7 @@ NS_IMPL_THREADSAFE_ISUPPORTS6(nsGopherChannel,
|
|||
nsIStreamListener,
|
||||
nsIRequestObserver,
|
||||
nsIDirectoryListing,
|
||||
nsITransportEventSink);
|
||||
nsITransportEventSink)
|
||||
|
||||
nsresult
|
||||
nsGopherChannel::Init(nsIURI* uri, nsIProxyInfo* proxyInfo)
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ nsGopherHandler::~nsGopherHandler() {
|
|||
|
||||
NS_IMPL_THREADSAFE_ISUPPORTS2(nsGopherHandler,
|
||||
nsIProxiedProtocolHandler,
|
||||
nsIProtocolHandler);
|
||||
nsIProtocolHandler)
|
||||
|
||||
NS_METHOD
|
||||
nsGopherHandler::Create(nsISupports* aOuter, const nsIID& aIID, void* *aResult) {
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ nsHttpBasicAuth::~nsHttpBasicAuth()
|
|||
// nsHttpBasicAuth::nsISupports
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
NS_IMPL_ISUPPORTS1(nsHttpBasicAuth, nsIHttpAuthenticator);
|
||||
NS_IMPL_ISUPPORTS1(nsHttpBasicAuth, nsIHttpAuthenticator)
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// nsHttpBasicAuth::nsIHttpAuthenticator
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ nsHttpDigestAuth::nsHttpDigestAuth()
|
|||
// nsHttpDigestAuth::nsISupports
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
NS_IMPL_ISUPPORTS1(nsHttpDigestAuth, nsIHttpAuthenticator);
|
||||
NS_IMPL_ISUPPORTS1(nsHttpDigestAuth, nsIHttpAuthenticator)
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// nsHttpDigestAuth <protected>
|
||||
|
|
|
|||
|
|
@ -200,7 +200,7 @@ nsHttpNTLMAuth::Init()
|
|||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMPL_ISUPPORTS1(nsHttpNTLMAuth, nsIHttpAuthenticator);
|
||||
NS_IMPL_ISUPPORTS1(nsHttpNTLMAuth, nsIHttpAuthenticator)
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsHttpNTLMAuth::ChallengeReceived(nsIHttpChannel *channel,
|
||||
|
|
|
|||
|
|
@ -48,6 +48,6 @@ static const nsModuleComponentInfo components[] =
|
|||
},
|
||||
};
|
||||
|
||||
NS_IMPL_NSGETMODULE(nsJarProtocolModule, components);
|
||||
NS_IMPL_NSGETMODULE(nsJarProtocolModule, components)
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ nsSOCKS4SocketProvider::~nsSOCKS4SocketProvider()
|
|||
{
|
||||
}
|
||||
|
||||
NS_IMPL_THREADSAFE_ISUPPORTS2(nsSOCKS4SocketProvider, nsISocketProvider, nsISOCKS4SocketProvider);
|
||||
NS_IMPL_THREADSAFE_ISUPPORTS2(nsSOCKS4SocketProvider, nsISocketProvider, nsISOCKS4SocketProvider)
|
||||
|
||||
NS_METHOD
|
||||
nsSOCKS4SocketProvider::Create(nsISupports *aOuter, REFNSIID aIID, void **aResult)
|
||||
|
|
|
|||
|
|
@ -90,7 +90,7 @@ nsSOCKSSocketInfo::~nsSOCKSSocketInfo()
|
|||
PR_FREEIF(mProxyHost);
|
||||
}
|
||||
|
||||
NS_IMPL_THREADSAFE_ISUPPORTS1(nsSOCKSSocketInfo, nsISOCKSSocketInfo);
|
||||
NS_IMPL_THREADSAFE_ISUPPORTS1(nsSOCKSSocketInfo, nsISOCKSSocketInfo)
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsSOCKSSocketInfo::GetProxyHost(char * *aProxyHost)
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ nsSOCKSSocketProvider::~nsSOCKSSocketProvider()
|
|||
{
|
||||
}
|
||||
|
||||
NS_IMPL_THREADSAFE_ISUPPORTS2(nsSOCKSSocketProvider, nsISocketProvider, nsISOCKSSocketProvider);
|
||||
NS_IMPL_THREADSAFE_ISUPPORTS2(nsSOCKSSocketProvider, nsISocketProvider, nsISOCKSSocketProvider)
|
||||
|
||||
NS_METHOD
|
||||
nsSOCKSSocketProvider::Create(nsISupports *aOuter, REFNSIID aIID, void **aResult)
|
||||
|
|
|
|||
|
|
@ -82,7 +82,7 @@ nsSocketProviderService::Create(nsISupports *aOuter, REFNSIID aIID, void **aResu
|
|||
return rv;
|
||||
}
|
||||
|
||||
NS_IMPL_THREADSAFE_ISUPPORTS1(nsSocketProviderService, nsISocketProviderService);
|
||||
NS_IMPL_THREADSAFE_ISUPPORTS1(nsSocketProviderService, nsISocketProviderService)
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
|
|
|
|||
|
|
@ -85,8 +85,8 @@ nsBinHexDecoder::~nsBinHexDecoder()
|
|||
nsMemory::Free(mOutgoingBuffer);
|
||||
}
|
||||
|
||||
NS_IMPL_ADDREF(nsBinHexDecoder);
|
||||
NS_IMPL_RELEASE(nsBinHexDecoder);
|
||||
NS_IMPL_ADDREF(nsBinHexDecoder)
|
||||
NS_IMPL_RELEASE(nsBinHexDecoder)
|
||||
|
||||
NS_INTERFACE_MAP_BEGIN(nsBinHexDecoder)
|
||||
NS_INTERFACE_MAP_ENTRY(nsIStreamConverter)
|
||||
|
|
|
|||
|
|
@ -41,16 +41,16 @@
|
|||
#include "nsISupportsObsolete.h"
|
||||
|
||||
NS_IMPL_THREADSAFE_ISUPPORTS1(nsDirIndex,
|
||||
nsIDirIndex);
|
||||
nsIDirIndex)
|
||||
|
||||
nsDirIndex::nsDirIndex() : mType(TYPE_UNKNOWN),
|
||||
mSize((PRUint32)(-1)),
|
||||
mLastModified(-1) {
|
||||
};
|
||||
}
|
||||
|
||||
nsDirIndex::~nsDirIndex() {};
|
||||
nsDirIndex::~nsDirIndex() {}
|
||||
|
||||
NS_IMPL_GETSET(nsDirIndex, Type, PRUint32, mType);
|
||||
NS_IMPL_GETSET(nsDirIndex, Type, PRUint32, mType)
|
||||
|
||||
// GETSET macros for modern strings would be nice...
|
||||
|
||||
|
|
@ -99,6 +99,6 @@ nsDirIndex::SetDescription(const PRUnichar* aDescription) {
|
|||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMPL_GETSET(nsDirIndex, Size, PRUint32, mSize);
|
||||
NS_IMPL_GETSET(nsDirIndex, LastModified, PRInt64, mLastModified);
|
||||
NS_IMPL_GETSET(nsDirIndex, Size, PRUint32, mSize)
|
||||
NS_IMPL_GETSET(nsDirIndex, LastModified, PRInt64, mLastModified)
|
||||
|
||||
|
|
|
|||
|
|
@ -105,7 +105,7 @@ nsDirIndexParser::~nsDirIndexParser() {
|
|||
if (--gRefCntParser == 0) {
|
||||
NS_IF_RELEASE(gTextToSubURI);
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsDirIndexParser::SetListener(nsIDirIndexListener* aListener) {
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@ PRLogModuleInfo* gFTPDirListConvLog = nsnull;
|
|||
NS_IMPL_THREADSAFE_ISUPPORTS3(nsFTPDirListingConv,
|
||||
nsIStreamConverter,
|
||||
nsIStreamListener,
|
||||
nsIRequestObserver);
|
||||
nsIRequestObserver)
|
||||
|
||||
|
||||
// nsIStreamConverter implementation
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@
|
|||
NS_IMPL_THREADSAFE_ISUPPORTS3(nsGopherDirListingConv,
|
||||
nsIStreamConverter,
|
||||
nsIStreamListener,
|
||||
nsIRequestObserver);
|
||||
nsIRequestObserver)
|
||||
|
||||
// nsIStreamConverter implementation
|
||||
|
||||
|
|
|
|||
|
|
@ -406,7 +406,7 @@ nsPartChannel::GetBaseChannel(nsIChannel ** aReturn)
|
|||
NS_IMPL_THREADSAFE_ISUPPORTS3(nsMultiMixedConv,
|
||||
nsIStreamConverter,
|
||||
nsIStreamListener,
|
||||
nsIRequestObserver);
|
||||
nsIRequestObserver)
|
||||
|
||||
|
||||
// nsIStreamConverter implementation
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ NS_IMPL_THREADSAFE_ISUPPORTS4(nsTXTToHTMLConv,
|
|||
nsIStreamConverter,
|
||||
nsITXTToHTMLConv,
|
||||
nsIRequestObserver,
|
||||
nsIStreamListener);
|
||||
nsIStreamListener)
|
||||
|
||||
|
||||
// nsIStreamConverter methods
|
||||
|
|
|
|||
|
|
@ -92,8 +92,8 @@ nsUnknownDecoder::~nsUnknownDecoder()
|
|||
//
|
||||
// ----
|
||||
|
||||
NS_IMPL_ADDREF(nsUnknownDecoder);
|
||||
NS_IMPL_RELEASE(nsUnknownDecoder);
|
||||
NS_IMPL_ADDREF(nsUnknownDecoder)
|
||||
NS_IMPL_RELEASE(nsUnknownDecoder)
|
||||
|
||||
NS_INTERFACE_MAP_BEGIN(nsUnknownDecoder)
|
||||
NS_INTERFACE_MAP_ENTRY(nsIStreamConverter)
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@
|
|||
#include "nsCRT.h"
|
||||
|
||||
|
||||
NS_IMPL_THREADSAFE_ISUPPORTS2(nsAppleFileDecoder, nsIAppleFileDecoder, nsIOutputStream);
|
||||
NS_IMPL_THREADSAFE_ISUPPORTS2(nsAppleFileDecoder, nsIAppleFileDecoder, nsIOutputStream)
|
||||
|
||||
nsAppleFileDecoder::nsAppleFileDecoder()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -103,4 +103,4 @@ static const nsModuleComponentInfo components[] =
|
|||
},
|
||||
};
|
||||
|
||||
NS_IMPL_NSGETMODULE(nsStreamConvModule, components);
|
||||
NS_IMPL_NSGETMODULE(nsStreamConvModule, components)
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@
|
|||
|
||||
////////////////////////////////////////////////////////////
|
||||
// nsISupports methods
|
||||
NS_IMPL_THREADSAFE_ISUPPORTS1(nsStreamConverterService, nsIStreamConverterService);
|
||||
NS_IMPL_THREADSAFE_ISUPPORTS1(nsStreamConverterService, nsIStreamConverterService)
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
|
|
@ -74,7 +74,7 @@ static PRBool PR_CALLBACK DeleteAdjacencyEntry(nsHashKey *aKey, void *aData, voi
|
|||
delete entry->data.edges;
|
||||
delete entry;
|
||||
return PR_TRUE;
|
||||
};
|
||||
}
|
||||
|
||||
nsresult
|
||||
nsStreamConverterService::Init() {
|
||||
|
|
@ -263,7 +263,7 @@ static PRBool PR_CALLBACK InitBFSTable(nsHashKey *aKey, void *aData, void* closu
|
|||
|
||||
BFSTable->Put(aKey, data);
|
||||
return PR_TRUE;
|
||||
};
|
||||
}
|
||||
|
||||
// cleans up the BFS state table
|
||||
static PRBool PR_CALLBACK DeleteBFSEntry(nsHashKey *aKey, void *aData, void *closure) {
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
// TestConverter
|
||||
//////////////////////////////////////////////////
|
||||
|
||||
NS_IMPL_ISUPPORTS2(TestConverter, nsIStreamConverter, nsIStreamListener);
|
||||
NS_IMPL_ISUPPORTS2(TestConverter, nsIStreamConverter, nsIStreamListener)
|
||||
|
||||
TestConverter::TestConverter() {
|
||||
}
|
||||
|
|
@ -69,7 +69,7 @@ TestConverter::AsyncConvertData(const PRUnichar *aFromType,
|
|||
toType = aToType;
|
||||
|
||||
return NS_OK;
|
||||
};
|
||||
}
|
||||
|
||||
// nsIStreamListener method
|
||||
/* This method handles asyncronous conversion of data. */
|
||||
|
|
@ -90,20 +90,20 @@ TestConverter::OnDataAvailable(nsIRequest* request,
|
|||
PRUint32 len;
|
||||
convertedStream->Available(&len);
|
||||
return mListener->OnDataAvailable(request, ctxt, convertedStream, sourceOffset, len);
|
||||
};
|
||||
}
|
||||
|
||||
// nsIRequestObserver methods
|
||||
/* These methods just pass through directly to the mListener */
|
||||
NS_IMETHODIMP
|
||||
TestConverter::OnStartRequest(nsIRequest* request, nsISupports *ctxt) {
|
||||
return mListener->OnStartRequest(request, ctxt);
|
||||
};
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
TestConverter::OnStopRequest(nsIRequest* request, nsISupports *ctxt,
|
||||
nsresult aStatus) {
|
||||
return mListener->OnStopRequest(request, ctxt, aStatus);
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
|
|
|
|||
|
|
@ -118,7 +118,7 @@ public:
|
|||
nsresult aStatus) { return NS_OK; }
|
||||
};
|
||||
|
||||
NS_IMPL_ISUPPORTS1(EndListener, nsIStreamListener);
|
||||
NS_IMPL_ISUPPORTS1(EndListener, nsIStreamListener)
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
// EndListener END
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
|
|
|
|||
|
|
@ -88,7 +88,7 @@ public:
|
|||
};
|
||||
};
|
||||
|
||||
NS_IMPL_THREADSAFE_ISUPPORTS1(ConsumerContext, nsIEquals);
|
||||
NS_IMPL_THREADSAFE_ISUPPORTS1(ConsumerContext, nsIEquals)
|
||||
|
||||
class Consumer : public nsIStreamListener {
|
||||
public:
|
||||
|
|
@ -111,7 +111,7 @@ public:
|
|||
};
|
||||
|
||||
// nsISupports implementation
|
||||
NS_IMPL_THREADSAFE_ISUPPORTS2(Consumer, nsIStreamListener, nsIRequestObserver);
|
||||
NS_IMPL_THREADSAFE_ISUPPORTS2(Consumer, nsIStreamListener, nsIRequestObserver)
|
||||
|
||||
|
||||
// nsIRequestObserver implementation
|
||||
|
|
|
|||
|
|
@ -191,8 +191,8 @@ private:
|
|||
PRMonitor* mMonitor;
|
||||
};
|
||||
|
||||
NS_IMPL_ADDREF(nsReader);
|
||||
NS_IMPL_RELEASE(nsReader);
|
||||
NS_IMPL_ADDREF(nsReader)
|
||||
NS_IMPL_RELEASE(nsReader)
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsReader::QueryInterface(const nsIID& aIID, void* *aInstancePtr)
|
||||
|
|
|
|||
|
|
@ -182,7 +182,7 @@ protected:
|
|||
PRUint32 mStopCount;
|
||||
};
|
||||
|
||||
NS_IMPL_THREADSAFE_ISUPPORTS2(MyListener, nsIStreamListener, nsIRequestObserver);
|
||||
NS_IMPL_THREADSAFE_ISUPPORTS2(MyListener, nsIStreamListener, nsIRequestObserver)
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
|
|
@ -332,7 +332,7 @@ public:
|
|||
virtual ~MyOpenObserver() {}
|
||||
};
|
||||
|
||||
NS_IMPL_ISUPPORTS1(MyOpenObserver, nsIRequestObserver);
|
||||
NS_IMPL_ISUPPORTS1(MyOpenObserver, nsIRequestObserver)
|
||||
#endif
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
|
|
|||
|
|
@ -173,7 +173,7 @@ TestHttpEventSink::~TestHttpEventSink()
|
|||
}
|
||||
|
||||
|
||||
NS_IMPL_ISUPPORTS1(TestHttpEventSink, nsIHttpEventSink);
|
||||
NS_IMPL_ISUPPORTS1(TestHttpEventSink, nsIHttpEventSink)
|
||||
|
||||
NS_IMETHODIMP
|
||||
TestHttpEventSink::OnRedirect(nsIHttpChannel *channel, nsIChannel *newChannel)
|
||||
|
|
|
|||
|
|
@ -125,7 +125,7 @@ TestListener::~TestListener() {
|
|||
printf( "TestListener dtor called on thread %d\n", mThreadNo );
|
||||
}
|
||||
|
||||
NS_IMPL_ISUPPORTS2( TestListener, nsIStreamListener, nsIRequestObserver );
|
||||
NS_IMPL_ISUPPORTS2( TestListener, nsIStreamListener, nsIRequestObserver )
|
||||
|
||||
NS_IMETHODIMP
|
||||
TestListener::OnStartRequest( nsIChannel *aChannel, nsISupports *aContext ) {
|
||||
|
|
|
|||
|
|
@ -2043,8 +2043,8 @@ CPluginManager::QueryInterface(const nsIID& iid, void** ptr)
|
|||
return NS_NOINTERFACE;
|
||||
}
|
||||
|
||||
NS_IMPL_ADDREF(CPluginManager);
|
||||
NS_IMPL_RELEASE(CPluginManager);
|
||||
NS_IMPL_ADDREF(CPluginManager)
|
||||
NS_IMPL_RELEASE(CPluginManager)
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
|
|
@ -2324,8 +2324,8 @@ CPluginInstancePeer::SetWindowSize(PRUint32 width, PRUint32 height)
|
|||
// nsISupports functions
|
||||
//+++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
|
||||
NS_IMPL_ADDREF(CPluginInstancePeer);
|
||||
NS_IMPL_RELEASE(CPluginInstancePeer);
|
||||
NS_IMPL_ADDREF(CPluginInstancePeer)
|
||||
NS_IMPL_RELEASE(CPluginInstancePeer)
|
||||
|
||||
NS_METHOD
|
||||
CPluginInstancePeer::QueryInterface(const nsIID& iid, void** ptr)
|
||||
|
|
|
|||
|
|
@ -302,7 +302,7 @@ void CSecureEnv::sendMessageFromJava(JNIEnv* javaEnv, JavaMessage* msg, Boolean
|
|||
// Thes macro expands to the aggregated query interface scheme.
|
||||
|
||||
#if 0
|
||||
NS_IMPL_AGGREGATED(CSecureEnv);
|
||||
NS_IMPL_AGGREGATED(CSecureEnv)
|
||||
|
||||
NS_METHOD
|
||||
CSecureEnv::AggregatedQueryInterface(const nsIID& aIID, void** aInstancePtr)
|
||||
|
|
|
|||
|
|
@ -124,7 +124,7 @@ public:
|
|||
|
||||
OSStatus read(void* buffer, SInt32 bufferSize, SInt32* bytesRead);
|
||||
};
|
||||
NS_IMPL_ISUPPORTS1(MRJInputStream, nsIPluginStreamListener);
|
||||
NS_IMPL_ISUPPORTS1(MRJInputStream, nsIPluginStreamListener)
|
||||
|
||||
NS_IMETHODIMP
|
||||
MRJInputStream::OnDataAvailable(nsIPluginStreamInfo* pluginInfo, nsIInputStream* input, PRUint32 length)
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@
|
|||
#include "nsIModule.h"
|
||||
#include "nsIGenericFactory.h"
|
||||
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsProfile, Init);
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsProfile, Init)
|
||||
|
||||
static const nsModuleComponentInfo components[] =
|
||||
{
|
||||
|
|
@ -51,4 +51,4 @@ static const nsModuleComponentInfo components[] =
|
|||
},
|
||||
};
|
||||
|
||||
NS_IMPL_NSGETMODULE(nsProfileModule, components);
|
||||
NS_IMPL_NSGETMODULE(nsProfileModule, components)
|
||||
|
|
|
|||
|
|
@ -76,4 +76,4 @@ static const nsModuleComponentInfo components[] =
|
|||
NS_PREFCONVERTER_CONTRACTID, nsPrefConverterConstructor}
|
||||
};
|
||||
|
||||
NS_IMPL_NSGETMODULE(nsPrefMigrationModule, components);
|
||||
NS_IMPL_NSGETMODULE(nsPrefMigrationModule, components)
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@
|
|||
#include "nsStringEnumerator.h"
|
||||
|
||||
// nsISupports methods
|
||||
NS_IMPL_THREADSAFE_ISUPPORTS1(nsMIMEInfoImpl, nsIMIMEInfo);
|
||||
NS_IMPL_THREADSAFE_ISUPPORTS1(nsMIMEInfoImpl, nsIMIMEInfo)
|
||||
|
||||
// nsMIMEInfoImpl methods
|
||||
nsMIMEInfoImpl::nsMIMEInfoImpl() {
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче