wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Back out bcf9ce858829 and a3bade82ac92 (bug 711799) for build failures

Browse Source
This commit is contained in:
Matt Brubeck 2011-12-19 10:43:08 -08:00
parent 446588a020
commit 62cc037b2e
15 changed files with 37 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
netwerk/base/src/nsDirectoryIndexStream.h
View File

@ -38,8 +38,6 @@
#ifndef nsDirectoryIndexStream_h__
#define nsDirectoryIndexStream_h__
#include "mozilla/Attributes.h"
#include "nsIFile.h"
#include "nsString.h"
#include "nsIInputStream.h"
@ -47,7 +45,7 @@
#include "nsCOMArray.h"
#include "nsITextToSubURI.h"
class nsDirectoryIndexStream MOZ_FINAL : public nsIInputStream
class nsDirectoryIndexStream : public nsIInputStream
{
private:
nsCString mBuf;

15
netwerk/base/src/nsIncrementalDownload.cpp
View File

@ -120,14 +120,13 @@ MakeRangeSpec(const PRInt64 &size, const PRInt64 &maxSize, PRInt32 chunkSize,
//-----------------------------------------------------------------------------
class nsIncrementalDownload MOZ_FINAL
: public nsIIncrementalDownload
, public nsIStreamListener
, public nsIObserver
, public nsIInterfaceRequestor
, public nsIChannelEventSink
, public nsSupportsWeakReference
, public nsIAsyncVerifyRedirectCallback
class nsIncrementalDownload : public nsIIncrementalDownload
, public nsIStreamListener
, public nsIObserver
, public nsIInterfaceRequestor
, public nsIChannelEventSink
, public nsSupportsWeakReference
, public nsIAsyncVerifyRedirectCallback
{
public:
NS_DECL_ISUPPORTS

2
tools/trace-malloc/lib/nsTraceMalloc.c
View File

@ -68,7 +68,6 @@
#include "plstr.h"
#include "nsStackWalk.h"
#include "nsTraceMallocCallbacks.h"
#include "nsTypeInfo.h"
#if defined(XP_MACOSX)
@ -1751,6 +1750,7 @@ allocation_enumerator(PLHashEntry *he, PRIntn i, void *arg)
FILE *ofp = (FILE*) arg;
callsite *site = (callsite*) he->value;
extern const char* nsGetTypeName(const void* ptr);
unsigned long *p, *end;
fprintf(ofp, "%p <%s> (%lu)\n",

2
tools/trace-malloc/lib/nsTypeInfo.cpp
View File

@ -52,7 +52,7 @@
#include <typeinfo>
#include <ctype.h>
#include "nsTypeInfo.h"
extern "C" const char* nsGetTypeName(void* ptr);
extern "C" void NS_TraceMallocShutdown();

52
tools/trace-malloc/lib/nsTypeInfo.h
View File

@ -1,52 +0,0 @@
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
*
* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is mozilla.org code.
*
* The Initial Developer of the Original Code is
* the Mozilla Foundation.
* Portions created by the Initial Developer are Copyright (C) 2011
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
#ifndef trace_malloc_nsTypeInfo_h_
#define trace_malloc_nsTypeInfo_h_
#include "prtypes.h"
PR_BEGIN_EXTERN_C
extern const char* nsGetTypeName(void* ptr);
extern void RegisterTraceMallocShutdown();
PR_END_EXTERN_C
#endif /* trace_malloc_nsTypeInfo_h_ */

2
tools/trace-malloc/spacetrace.c
View File

@ -1920,7 +1920,7 @@ static const char spinner_chars[] = { '/', '-', '\\', '|' };
void
tmEventHandler(tmreader * aReader, tmevent * aEvent)
{
static int event_count = 0; /* for spinner */
static event_count = 0; /* for spinner */
if ((event_count++ % SPINNER_UPDATE_FREQUENCY) == 0)
printf("\rReading... %c", SPINNER_CHAR(event_count));

4
xpcom/base/nsConsoleService.h
View File

@ -42,15 +42,13 @@
#ifndef __nsconsoleservice_h__
#define __nsconsoleservice_h__
#include "mozilla/Attributes.h"
#include "mozilla/Mutex.h"
#include "nsCOMPtr.h"
#include "nsHashtable.h"
#include "nsIConsoleService.h"
class nsConsoleService MOZ_FINAL : public nsIConsoleService
class nsConsoleService : public nsIConsoleService
{
public:
nsConsoleService();

2
xpcom/base/nsExceptionService.cpp
View File

@ -69,7 +69,7 @@ public:
};
/** Exception Manager definition **/
class nsExceptionManager MOZ_FINAL : public nsIExceptionManager
class nsExceptionManager : public nsIExceptionManager
{
public:
NS_DECL_ISUPPORTS

4
xpcom/base/nsExceptionService.h
View File

@ -39,9 +39,7 @@
#ifndef nsExceptionService_h__
#define nsExceptionService_h__
#include "mozilla/Attributes.h"
#include "mozilla/Mutex.h"
#include "nsIException.h"
#include "nsIExceptionService.h"
#include "nsIObserverService.h"
@ -51,7 +49,7 @@
class nsExceptionManager;
/** Exception Service definition **/
class nsExceptionService MOZ_FINAL : public nsIExceptionService, public nsIObserver
class nsExceptionService : public nsIExceptionService, public nsIObserver
{
public:
NS_DECL_ISUPPORTS

4
xpcom/base/nsUUIDGenerator.h
View File

@ -39,12 +39,10 @@
#ifndef _NSUUIDGENERATOR_H_
#define _NSUUIDGENERATOR_H_
#include "mozilla/Attributes.h"
#include "mozilla/Mutex.h"
#include "nsIUUIDGenerator.h"
class nsUUIDGenerator MOZ_FINAL : public nsIUUIDGenerator {
class nsUUIDGenerator : public nsIUUIDGenerator {
public:
nsUUIDGenerator();

2
xpcom/base/nsVersionComparatorImpl.h
View File

@ -37,7 +37,7 @@
#include "nsIVersionComparator.h"
class nsVersionComparatorImpl MOZ_FINAL : public nsIVersionComparator
class nsVersionComparatorImpl : public nsIVersionComparator
{
public:
NS_DECL_ISUPPORTS

3
xpcom/components/ModuleUtils.h
View File

@ -39,7 +39,6 @@
#ifndef mozilla_GenericModule_h
#define mozilla_GenericModule_h
#include "mozilla/Attributes.h"
#include "mozilla/Module.h"
#define NS_GENERIC_FACTORY_CONSTRUCTOR(_InstanceClass) \
@ -135,7 +134,7 @@ _InstanceClass##Constructor(nsISupports *aOuter, REFNSIID aIID, \
namespace mozilla {
class GenericModule MOZ_FINAL : public nsIModule
class GenericModule : public nsIModule
{
public:
GenericModule(const mozilla::Module* aData)

4
xpcom/ds/nsByteBuffer.h
View File

@ -38,11 +38,9 @@
#ifndef nsByteBuffer_h__
#define nsByteBuffer_h__
#include "mozilla/Attributes.h"
#include "nsIByteBuffer.h"
class ByteBufferImpl MOZ_FINAL : public nsIByteBuffer {
class ByteBufferImpl : public nsIByteBuffer {
public:
ByteBufferImpl(void);

38
xpcom/ds/nsSupportsPrimitives.h
View File

@ -39,14 +39,12 @@
#ifndef nsSupportsPrimitives_h__
#define nsSupportsPrimitives_h__
#include "mozilla/Attributes.h"
#include "nsISupportsPrimitives.h"
#include "nsCOMPtr.h"
#include "nsString.h"
#include "nsDependentString.h"
class nsSupportsIDImpl MOZ_FINAL : public nsISupportsID
class nsSupportsIDImpl : public nsISupportsID
{
public:
NS_DECL_ISUPPORTS
@ -63,7 +61,7 @@ private:
/***************************************************************************/
class nsSupportsCStringImpl MOZ_FINAL : public nsISupportsCString
class nsSupportsCStringImpl : public nsISupportsCString
{
public:
NS_DECL_ISUPPORTS
@ -80,7 +78,7 @@ private:
/***************************************************************************/
class nsSupportsStringImpl MOZ_FINAL : public nsISupportsString
class nsSupportsStringImpl : public nsISupportsString
{
public:
NS_DECL_ISUPPORTS
@ -97,7 +95,7 @@ private:
/***************************************************************************/
class nsSupportsPRBoolImpl MOZ_FINAL : public nsISupportsPRBool
class nsSupportsPRBoolImpl : public nsISupportsPRBool
{
public:
NS_DECL_ISUPPORTS
@ -114,7 +112,7 @@ private:
/***************************************************************************/
class nsSupportsPRUint8Impl MOZ_FINAL : public nsISupportsPRUint8
class nsSupportsPRUint8Impl : public nsISupportsPRUint8
{
public:
NS_DECL_ISUPPORTS
@ -131,7 +129,7 @@ private:
/***************************************************************************/
class nsSupportsPRUint16Impl MOZ_FINAL : public nsISupportsPRUint16
class nsSupportsPRUint16Impl : public nsISupportsPRUint16
{
public:
NS_DECL_ISUPPORTS
@ -148,7 +146,7 @@ private:
/***************************************************************************/
class nsSupportsPRUint32Impl MOZ_FINAL : public nsISupportsPRUint32
class nsSupportsPRUint32Impl : public nsISupportsPRUint32
{
public:
NS_DECL_ISUPPORTS
@ -165,7 +163,7 @@ private:
/***************************************************************************/
class nsSupportsPRUint64Impl MOZ_FINAL : public nsISupportsPRUint64
class nsSupportsPRUint64Impl : public nsISupportsPRUint64
{
public:
NS_DECL_ISUPPORTS
@ -182,7 +180,7 @@ private:
/***************************************************************************/
class nsSupportsPRTimeImpl MOZ_FINAL : public nsISupportsPRTime
class nsSupportsPRTimeImpl : public nsISupportsPRTime
{
public:
NS_DECL_ISUPPORTS
@ -199,7 +197,7 @@ private:
/***************************************************************************/
class nsSupportsCharImpl MOZ_FINAL : public nsISupportsChar
class nsSupportsCharImpl : public nsISupportsChar
{
public:
NS_DECL_ISUPPORTS
@ -216,7 +214,7 @@ private:
/***************************************************************************/
class nsSupportsPRInt16Impl MOZ_FINAL : public nsISupportsPRInt16
class nsSupportsPRInt16Impl : public nsISupportsPRInt16
{
public:
NS_DECL_ISUPPORTS
@ -233,7 +231,7 @@ private:
/***************************************************************************/
class nsSupportsPRInt32Impl MOZ_FINAL : public nsISupportsPRInt32
class nsSupportsPRInt32Impl : public nsISupportsPRInt32
{
public:
NS_DECL_ISUPPORTS
@ -250,7 +248,7 @@ private:
/***************************************************************************/
class nsSupportsPRInt64Impl MOZ_FINAL : public nsISupportsPRInt64
class nsSupportsPRInt64Impl : public nsISupportsPRInt64
{
public:
NS_DECL_ISUPPORTS
@ -267,7 +265,7 @@ private:
/***************************************************************************/
class nsSupportsFloatImpl MOZ_FINAL : public nsISupportsFloat
class nsSupportsFloatImpl : public nsISupportsFloat
{
public:
NS_DECL_ISUPPORTS
@ -284,7 +282,7 @@ private:
/***************************************************************************/
class nsSupportsDoubleImpl MOZ_FINAL : public nsISupportsDouble
class nsSupportsDoubleImpl : public nsISupportsDouble
{
public:
NS_DECL_ISUPPORTS
@ -301,7 +299,7 @@ private:
/***************************************************************************/
class nsSupportsVoidImpl MOZ_FINAL : public nsISupportsVoid
class nsSupportsVoidImpl : public nsISupportsVoid
{
public:
NS_DECL_ISUPPORTS
@ -318,7 +316,7 @@ private:
/***************************************************************************/
class nsSupportsInterfacePointerImpl MOZ_FINAL : public nsISupportsInterfacePointer
class nsSupportsInterfacePointerImpl : public nsISupportsInterfacePointer
{
public:
NS_DECL_ISUPPORTS
@ -342,7 +340,7 @@ private:
* Only use this class with static buffers, or arena-allocated buffers of
* permanent lifetime!
*/
class nsSupportsDependentCString MOZ_FINAL : public nsISupportsCString
class nsSupportsDependentCString : public nsISupportsCString
{
public:
NS_DECL_ISUPPORTS

4
xpcom/glue/nsCategoryCache.h
View File

@ -37,8 +37,6 @@
#ifndef nsCategoryCache_h_
#define nsCategoryCache_h_
#include "mozilla/Attributes.h"
#include "nsICategoryManager.h"
#include "nsIObserver.h"
#include "nsISimpleEnumerator.h"
@ -64,7 +62,7 @@ class NS_NO_VTABLE nsCategoryListener {
virtual void CategoryCleared() = 0;
};
class NS_COM_GLUE nsCategoryObserver MOZ_FINAL : public nsIObserver {
class NS_COM_GLUE nsCategoryObserver : public nsIObserver {
public:
nsCategoryObserver(const char* aCategory,
nsCategoryListener* aCategoryListener);