Back out bcf9ce858829 and a3bade82ac92 (bug 711799) for build failures
authorMatt Brubeck <mbrubeck@mozilla.com>
Mon, 19 Dec 2011 10:43:08 -0800
changeset 83054 c62b8bcb94d41415a23bfb775abc623d00436256
parent 83053 19062b47ae9f2f8d715992b692d53cae1e44aa67
child 83055 e588135f62ab2e9b1e688982ea284d1489a7b7f7
push id21724
push userbmo@edmorley.co.uk
push dateTue, 20 Dec 2011 11:16:15 +0000
treeherdermozilla-central@32d762c16927 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs711799
milestone11.0a1
backs outbcf9ce858829d8f46dc8927062b16e251ebee0d5
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Back out bcf9ce858829 and a3bade82ac92 (bug 711799) for build failures
netwerk/base/src/nsDirectoryIndexStream.h
netwerk/base/src/nsIncrementalDownload.cpp
tools/trace-malloc/lib/nsTraceMalloc.c
tools/trace-malloc/lib/nsTypeInfo.cpp
tools/trace-malloc/lib/nsTypeInfo.h
tools/trace-malloc/spacetrace.c
xpcom/base/nsConsoleService.h
xpcom/base/nsExceptionService.cpp
xpcom/base/nsExceptionService.h
xpcom/base/nsUUIDGenerator.h
xpcom/base/nsVersionComparatorImpl.h
xpcom/components/ModuleUtils.h
xpcom/ds/nsByteBuffer.h
xpcom/ds/nsSupportsPrimitives.h
xpcom/glue/nsCategoryCache.h
--- a/netwerk/base/src/nsDirectoryIndexStream.h
+++ b/netwerk/base/src/nsDirectoryIndexStream.h
@@ -33,26 +33,24 @@
  * 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 nsDirectoryIndexStream_h__
 #define nsDirectoryIndexStream_h__
 
-#include "mozilla/Attributes.h"
-
 #include "nsIFile.h"
 #include "nsString.h"
 #include "nsIInputStream.h"
 #include "nsCOMPtr.h"
 #include "nsCOMArray.h"
 #include "nsITextToSubURI.h"
 
-class nsDirectoryIndexStream MOZ_FINAL : public nsIInputStream
+class nsDirectoryIndexStream : public nsIInputStream
 {
 private:
     nsCString mBuf;
     PRInt32 mOffset;
     nsresult mStatus;
 
     PRInt32             mPos;   // position within mArray
     nsCOMArray<nsIFile> mArray; // file objects within the directory
--- a/netwerk/base/src/nsIncrementalDownload.cpp
+++ b/netwerk/base/src/nsIncrementalDownload.cpp
@@ -115,24 +115,23 @@ MakeRangeSpec(const PRInt64 &size, const
     end = maxSize;
   end -= 1;
 
   rangeSpec.AppendInt(PRInt64(end));
 }
 
 //-----------------------------------------------------------------------------
 
-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
   NS_DECL_NSIREQUEST
   NS_DECL_NSIINCREMENTALDOWNLOAD
   NS_DECL_NSIREQUESTOBSERVER
   NS_DECL_NSISTREAMLISTENER
   NS_DECL_NSIOBSERVER
--- a/tools/trace-malloc/lib/nsTraceMalloc.c
+++ b/tools/trace-malloc/lib/nsTraceMalloc.c
@@ -63,17 +63,16 @@
 #include "prnetdb.h"
 #include "nsTraceMalloc.h"
 #include "nscore.h"
 #include "prinit.h"
 #include "prthread.h"
 #include "plstr.h"
 #include "nsStackWalk.h"
 #include "nsTraceMallocCallbacks.h"
-#include "nsTypeInfo.h"
 
 #if defined(XP_MACOSX)
 
 #include <malloc/malloc.h>
 
 #define WRITE_FLAGS "w"
 
 #define __libc_malloc(x)                malloc(x)
@@ -1746,16 +1745,17 @@ print_stack(FILE *ofp, callsite *site)
 
 static PRIntn
 allocation_enumerator(PLHashEntry *he, PRIntn i, void *arg)
 {
     allocation *alloc = (allocation*) he;
     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",
             he->key,
             nsGetTypeName(he->key),
             (unsigned long) alloc->size);
 
     for (p   = (unsigned long*) he->key,
--- a/tools/trace-malloc/lib/nsTypeInfo.cpp
+++ b/tools/trace-malloc/lib/nsTypeInfo.cpp
@@ -47,17 +47,17 @@
   use C++ RTTI's typeid operation to obtain the name of the type.
   
   by Patrick C. Beard.
  */
 
 #include <typeinfo>
 #include <ctype.h>
 
-#include "nsTypeInfo.h"
+extern "C" const char* nsGetTypeName(void* ptr);
 
 extern "C" void NS_TraceMallocShutdown();
 
 struct TraceMallocShutdown {
     TraceMallocShutdown() {}
     ~TraceMallocShutdown() {
         NS_TraceMallocShutdown();
     }
deleted file mode 100644
--- a/tools/trace-malloc/lib/nsTypeInfo.h
+++ /dev/null
@@ -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_ */
--- a/tools/trace-malloc/spacetrace.c
+++ b/tools/trace-malloc/spacetrace.c
@@ -1915,17 +1915,17 @@ static const char spinner_chars[] = { '/
 
 #define SPINNER_UPDATE_FREQUENCY 4096
 #define SPINNER_CHAR_COUNT (sizeof(spinner_chars) / sizeof(spinner_chars[0]))
 #define SPINNER_CHAR(_x) spinner_chars[(_x / SPINNER_UPDATE_FREQUENCY) % SPINNER_CHAR_COUNT]
 
 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));
     
     if (NULL != aReader && NULL != aEvent) {
         switch (aEvent->type) {
             /*
              ** Events we ignore.
              */
--- a/xpcom/base/nsConsoleService.h
+++ b/xpcom/base/nsConsoleService.h
@@ -37,25 +37,23 @@
 
 /*
  * nsConsoleService class declaration.
  */
 
 #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();
     nsresult Init();
 
     NS_DECL_ISUPPORTS
     NS_DECL_NSICONSOLESERVICE
 
--- a/xpcom/base/nsExceptionService.cpp
+++ b/xpcom/base/nsExceptionService.cpp
@@ -64,17 +64,17 @@ public:
   }
   nsHashKey *Clone() const {
     return new nsProviderKey(mKey);
   }
   PRUint32 GetValue() { return mKey; }
 };
 
 /** Exception Manager definition **/
-class nsExceptionManager MOZ_FINAL : public nsIExceptionManager
+class nsExceptionManager : public nsIExceptionManager
 {
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSIEXCEPTIONMANAGER
 
   nsExceptionManager(nsExceptionService *svc);
   /* additional members */
   nsCOMPtr<nsIException> mCurrentException;
--- a/xpcom/base/nsExceptionService.h
+++ b/xpcom/base/nsExceptionService.h
@@ -34,29 +34,27 @@
  * 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 nsExceptionService_h__
 #define nsExceptionService_h__
 
-#include "mozilla/Attributes.h"
 #include "mozilla/Mutex.h"
-
 #include "nsIException.h"
 #include "nsIExceptionService.h"
 #include "nsIObserverService.h"
 #include "nsHashtable.h"
 #include "nsIObserver.h"
 
 class nsExceptionManager;
 
 /** Exception Service definition **/
-class nsExceptionService MOZ_FINAL : public nsIExceptionService, public nsIObserver
+class nsExceptionService : public nsIExceptionService, public nsIObserver
 {
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSIEXCEPTIONSERVICE
   NS_DECL_NSIEXCEPTIONMANAGER
   NS_DECL_NSIOBSERVER
 
   nsExceptionService();
--- a/xpcom/base/nsUUIDGenerator.h
+++ b/xpcom/base/nsUUIDGenerator.h
@@ -34,22 +34,20 @@
  * 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 _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();
 
     NS_DECL_ISUPPORTS
 
     NS_DECL_NSIUUIDGENERATOR
 
     nsresult Init();
--- a/xpcom/base/nsVersionComparatorImpl.h
+++ b/xpcom/base/nsVersionComparatorImpl.h
@@ -32,17 +32,17 @@
  * 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 ***** */
 
 #include "nsIVersionComparator.h"
 
-class nsVersionComparatorImpl MOZ_FINAL : public nsIVersionComparator
+class nsVersionComparatorImpl : public nsIVersionComparator
 {
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSIVERSIONCOMPARATOR
 };
 
 #define NS_VERSIONCOMPARATOR_CONTRACTID "@mozilla.org/xpcom/version-comparator;1"
 
--- a/xpcom/components/ModuleUtils.h
+++ b/xpcom/components/ModuleUtils.h
@@ -34,17 +34,16 @@
  * 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 mozilla_GenericModule_h
 #define mozilla_GenericModule_h
 
-#include "mozilla/Attributes.h"
 #include "mozilla/Module.h"
 
 #define NS_GENERIC_FACTORY_CONSTRUCTOR(_InstanceClass)                        \
 static nsresult                                                               \
 _InstanceClass##Constructor(nsISupports *aOuter, REFNSIID aIID,               \
                             void **aResult)                                   \
 {                                                                             \
     nsresult rv;                                                              \
@@ -130,17 +129,17 @@ static nsresult                         
 
 #ifndef MOZILLA_INTERNAL_API
 
 #include "nsIModule.h"
 #include "nsISupportsUtils.h"
 
 namespace mozilla {
 
-class GenericModule MOZ_FINAL : public nsIModule
+class GenericModule : public nsIModule
 {
 public:
     GenericModule(const mozilla::Module* aData)
         : mData(aData)
     {
     }
 
     NS_DECL_ISUPPORTS
--- a/xpcom/ds/nsByteBuffer.h
+++ b/xpcom/ds/nsByteBuffer.h
@@ -33,21 +33,19 @@
  * 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 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);
 
   NS_DECL_ISUPPORTS
 
   static nsresult
   Create(nsISupports *aOuter, REFNSIID aIID, void **aResult);
 
--- a/xpcom/ds/nsSupportsPrimitives.h
+++ b/xpcom/ds/nsSupportsPrimitives.h
@@ -34,296 +34,294 @@
  * 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 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
     NS_DECL_NSISUPPORTSPRIMITIVE
     NS_DECL_NSISUPPORTSID
 
     nsSupportsIDImpl();
 
 private:
     ~nsSupportsIDImpl() { }
 
     nsID *mData;
 };
 
 /***************************************************************************/
 
-class nsSupportsCStringImpl MOZ_FINAL : public nsISupportsCString
+class nsSupportsCStringImpl : public nsISupportsCString
 {
 public:
     NS_DECL_ISUPPORTS
     NS_DECL_NSISUPPORTSPRIMITIVE
     NS_DECL_NSISUPPORTSCSTRING
 
     nsSupportsCStringImpl() {}
 
 private:
     ~nsSupportsCStringImpl() {}
     
     nsCString mData;
 };
 
 /***************************************************************************/
 
-class nsSupportsStringImpl MOZ_FINAL : public nsISupportsString
+class nsSupportsStringImpl : public nsISupportsString
 {
 public:
     NS_DECL_ISUPPORTS
     NS_DECL_NSISUPPORTSPRIMITIVE
     NS_DECL_NSISUPPORTSSTRING
 
     nsSupportsStringImpl() {}
 
 private:
     ~nsSupportsStringImpl() {}
     
     nsString mData;
 };
 
 /***************************************************************************/
 
-class nsSupportsPRBoolImpl MOZ_FINAL : public nsISupportsPRBool
+class nsSupportsPRBoolImpl : public nsISupportsPRBool
 {
 public:
     NS_DECL_ISUPPORTS
     NS_DECL_NSISUPPORTSPRIMITIVE
     NS_DECL_NSISUPPORTSPRBOOL
 
     nsSupportsPRBoolImpl();
 
 private:
     ~nsSupportsPRBoolImpl() {}
 
     bool mData;
 };
 
 /***************************************************************************/
 
-class nsSupportsPRUint8Impl MOZ_FINAL : public nsISupportsPRUint8
+class nsSupportsPRUint8Impl : public nsISupportsPRUint8
 {
 public:
     NS_DECL_ISUPPORTS
     NS_DECL_NSISUPPORTSPRIMITIVE
     NS_DECL_NSISUPPORTSPRUINT8
 
     nsSupportsPRUint8Impl();
 
 private:
     ~nsSupportsPRUint8Impl() {}
 
     PRUint8 mData;
 };
 
 /***************************************************************************/
 
-class nsSupportsPRUint16Impl MOZ_FINAL : public nsISupportsPRUint16
+class nsSupportsPRUint16Impl : public nsISupportsPRUint16
 {
 public:
     NS_DECL_ISUPPORTS
     NS_DECL_NSISUPPORTSPRIMITIVE
     NS_DECL_NSISUPPORTSPRUINT16
 
     nsSupportsPRUint16Impl();
 
 private:
     ~nsSupportsPRUint16Impl() {}
 
     PRUint16 mData;
 };
 
 /***************************************************************************/
 
-class nsSupportsPRUint32Impl MOZ_FINAL : public nsISupportsPRUint32
+class nsSupportsPRUint32Impl : public nsISupportsPRUint32
 {
 public:
     NS_DECL_ISUPPORTS
     NS_DECL_NSISUPPORTSPRIMITIVE
     NS_DECL_NSISUPPORTSPRUINT32
 
     nsSupportsPRUint32Impl();
 
 private:
     ~nsSupportsPRUint32Impl() {}
 
     PRUint32 mData;
 };
 
 /***************************************************************************/
 
-class nsSupportsPRUint64Impl MOZ_FINAL : public nsISupportsPRUint64
+class nsSupportsPRUint64Impl : public nsISupportsPRUint64
 {
 public:
     NS_DECL_ISUPPORTS
     NS_DECL_NSISUPPORTSPRIMITIVE
     NS_DECL_NSISUPPORTSPRUINT64
 
     nsSupportsPRUint64Impl();
 
 private:
     ~nsSupportsPRUint64Impl() {}
 
     PRUint64 mData;
 };
 
 /***************************************************************************/
 
-class nsSupportsPRTimeImpl MOZ_FINAL : public nsISupportsPRTime
+class nsSupportsPRTimeImpl : public nsISupportsPRTime
 {
 public:
     NS_DECL_ISUPPORTS
     NS_DECL_NSISUPPORTSPRIMITIVE
     NS_DECL_NSISUPPORTSPRTIME
 
     nsSupportsPRTimeImpl();
 
 private:
     ~nsSupportsPRTimeImpl() {}
 
     PRTime mData;
 };
 
 /***************************************************************************/
 
-class nsSupportsCharImpl MOZ_FINAL : public nsISupportsChar
+class nsSupportsCharImpl : public nsISupportsChar
 {
 public:
     NS_DECL_ISUPPORTS
     NS_DECL_NSISUPPORTSPRIMITIVE
     NS_DECL_NSISUPPORTSCHAR
 
     nsSupportsCharImpl();
 
 private:
     ~nsSupportsCharImpl() {}
 
     char mData;
 };
 
 /***************************************************************************/
 
-class nsSupportsPRInt16Impl MOZ_FINAL : public nsISupportsPRInt16
+class nsSupportsPRInt16Impl : public nsISupportsPRInt16
 {
 public:
     NS_DECL_ISUPPORTS
     NS_DECL_NSISUPPORTSPRIMITIVE
     NS_DECL_NSISUPPORTSPRINT16
 
     nsSupportsPRInt16Impl();
 
 private:
     ~nsSupportsPRInt16Impl() {}
 
     PRInt16 mData;
 };
 
 /***************************************************************************/
 
-class nsSupportsPRInt32Impl MOZ_FINAL : public nsISupportsPRInt32
+class nsSupportsPRInt32Impl : public nsISupportsPRInt32
 {
 public:
     NS_DECL_ISUPPORTS
     NS_DECL_NSISUPPORTSPRIMITIVE
     NS_DECL_NSISUPPORTSPRINT32
 
     nsSupportsPRInt32Impl();
 
 private:
     ~nsSupportsPRInt32Impl() {}
 
     PRInt32 mData;
 };
 
 /***************************************************************************/
 
-class nsSupportsPRInt64Impl MOZ_FINAL : public nsISupportsPRInt64
+class nsSupportsPRInt64Impl : public nsISupportsPRInt64
 {
 public:
     NS_DECL_ISUPPORTS
     NS_DECL_NSISUPPORTSPRIMITIVE
     NS_DECL_NSISUPPORTSPRINT64
 
     nsSupportsPRInt64Impl();
 
 private:
     ~nsSupportsPRInt64Impl() {}
 
     PRInt64 mData;
 };
 
 /***************************************************************************/
 
-class nsSupportsFloatImpl MOZ_FINAL : public nsISupportsFloat
+class nsSupportsFloatImpl : public nsISupportsFloat
 {
 public:
     NS_DECL_ISUPPORTS
     NS_DECL_NSISUPPORTSPRIMITIVE
     NS_DECL_NSISUPPORTSFLOAT
 
     nsSupportsFloatImpl();
 
 private:
     ~nsSupportsFloatImpl() {}
 
     float mData;
 };
 
 /***************************************************************************/
 
-class nsSupportsDoubleImpl MOZ_FINAL : public nsISupportsDouble
+class nsSupportsDoubleImpl : public nsISupportsDouble
 {
 public:
     NS_DECL_ISUPPORTS
     NS_DECL_NSISUPPORTSPRIMITIVE
     NS_DECL_NSISUPPORTSDOUBLE
 
     nsSupportsDoubleImpl();
 
 private:
     ~nsSupportsDoubleImpl() {}
 
     double mData;
 };
 
 /***************************************************************************/
 
-class nsSupportsVoidImpl MOZ_FINAL : public nsISupportsVoid
+class nsSupportsVoidImpl : public nsISupportsVoid
 {
 public:
     NS_DECL_ISUPPORTS
     NS_DECL_NSISUPPORTSPRIMITIVE
     NS_DECL_NSISUPPORTSVOID
 
     nsSupportsVoidImpl();
 
 private:
     ~nsSupportsVoidImpl() {}
 
     void* mData;
 };
 
 /***************************************************************************/
 
-class nsSupportsInterfacePointerImpl MOZ_FINAL : public nsISupportsInterfacePointer
+class nsSupportsInterfacePointerImpl : public nsISupportsInterfacePointer
 {
 public:
     NS_DECL_ISUPPORTS
     NS_DECL_NSISUPPORTSPRIMITIVE
     NS_DECL_NSISUPPORTSINTERFACEPOINTER
 
     nsSupportsInterfacePointerImpl();
 
@@ -337,17 +335,17 @@ private:
 /***************************************************************************/
 
 /**
  * Wraps a static const char* buffer for use with nsISupportsCString
  *
  * 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
   NS_DECL_NSISUPPORTSPRIMITIVE
   NS_DECL_NSISUPPORTSCSTRING
 
   nsSupportsDependentCString(const char* aStr);
 
--- a/xpcom/glue/nsCategoryCache.h
+++ b/xpcom/glue/nsCategoryCache.h
@@ -32,18 +32,16 @@
  * 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 nsCategoryCache_h_
 #define nsCategoryCache_h_
 
-#include "mozilla/Attributes.h"
-
 #include "nsICategoryManager.h"
 #include "nsIObserver.h"
 #include "nsISimpleEnumerator.h"
 #include "nsISupportsPrimitives.h"
 
 #include "nsServiceManagerUtils.h"
 
 #include "nsAutoPtr.h"
@@ -59,17 +57,17 @@ class NS_NO_VTABLE nsCategoryListener {
     ~nsCategoryListener() {}
 
   public:
     virtual void EntryAdded(const nsCString& aValue) = 0;
     virtual void EntryRemoved(const nsCString& aValue) = 0;
     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);
     ~nsCategoryObserver();
 
     void ListenerDied();
 
     NS_DECL_ISUPPORTS