Backing out my last change since it broke the tree, sorry.

content/base/src/nsGenericElement.h

@@ -201,10 +201,10 @@ public:
   void      Finalize(JSContext *aContext, JSObject *aObj);
 
   // Implementation for nsISupports
-  nsresult QueryInterface(REFNSIID aIID,
-                          void** aInstancePtr);
-  nsrefcnt AddRef(void);
-  nsrefcnt Release(void);
+  NS_IMETHOD QueryInterface(REFNSIID aIID,
+                            void** aInstancePtr);
+  NS_IMETHOD_(nsrefcnt) AddRef(void);
+  NS_IMETHOD_(nsrefcnt) Release(void);
 
   //----------------------------------------
 

layout/base/src/nsGenericElement.h

@@ -201,10 +201,10 @@ public:
   void      Finalize(JSContext *aContext, JSObject *aObj);
 
   // Implementation for nsISupports
-  nsresult QueryInterface(REFNSIID aIID,
-                          void** aInstancePtr);
-  nsrefcnt AddRef(void);
-  nsrefcnt Release(void);
+  NS_IMETHOD QueryInterface(REFNSIID aIID,
+                            void** aInstancePtr);
+  NS_IMETHOD_(nsrefcnt) AddRef(void);
+  NS_IMETHOD_(nsrefcnt) Release(void);
 
   //----------------------------------------