[spicebird] fix gcc47 patch
Tom Callaway
spot at fedoraproject.org
Wed Mar 7 20:51:07 UTC 2012
commit c7e856926fe30168e98ef2d1998fd99a70e3a071
Author: Tom Callaway <spot at fedoraproject.org>
Date: Wed Mar 7 15:51:04 2012 -0500
fix gcc47 patch
spicebird-gcc47.patch | 640 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 633 insertions(+), 7 deletions(-)
---
diff --git a/spicebird-gcc47.patch b/spicebird-gcc47.patch
index 7312fb0..9b4009b 100644
--- a/spicebird-gcc47.patch
+++ b/spicebird-gcc47.patch
@@ -1,6 +1,620 @@
+diff -up mozilla/accessible/src/base/nsBaseWidgetAccessible.h.gcc47 mozilla/accessible/src/base/nsBaseWidgetAccessible.h
+--- mozilla/accessible/src/base/nsBaseWidgetAccessible.h.gcc47 2012-03-07 14:23:10.525006171 -0500
++++ mozilla/accessible/src/base/nsBaseWidgetAccessible.h 2012-03-07 14:23:21.765012073 -0500
+@@ -122,7 +122,7 @@ public:
+ nsEnumRoleAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell, PRUint32 aRole);
+ virtual ~nsEnumRoleAccessible() { }
+ NS_DECL_ISUPPORTS_INHERITED
+- NS_IMETHODIMP GetRole(PRUint32 *aRole) { *aRole = mRole; return NS_OK; }
++ NS_IMETHOD GetRole(PRUint32 *aRole) { *aRole = mRole; return NS_OK; }
+
+ protected:
+ PRUint32 mRole;
+diff -up mozilla/content/html/content/src/nsGenericHTMLElement.h.gcc47 mozilla/content/html/content/src/nsGenericHTMLElement.h
+--- mozilla/content/html/content/src/nsGenericHTMLElement.h.gcc47 2012-03-07 11:33:02.905004422 -0500
++++ mozilla/content/html/content/src/nsGenericHTMLElement.h 2012-03-07 11:34:00.310005862 -0500
+@@ -103,16 +103,16 @@ public:
+ nsresult CopyInnerTo(nsGenericElement* aDest) const;
+
+ // Implementation for nsIDOMNode
+- NS_METHOD GetNodeName(nsAString& aNodeName);
+- NS_METHOD GetLocalName(nsAString& aLocalName);
++ NS_IMETHOD GetNodeName(nsAString& aNodeName);
++ NS_IMETHOD GetLocalName(nsAString& aLocalName);
+
+ // Implementation for nsIDOMElement
+- NS_METHOD SetAttribute(const nsAString& aName,
++ NS_IMETHOD SetAttribute(const nsAString& aName,
+ const nsAString& aValue);
+- NS_METHOD GetTagName(nsAString& aTagName);
+- NS_METHOD GetElementsByTagName(const nsAString& aTagname,
++ NS_IMETHOD GetTagName(nsAString& aTagName);
++ NS_IMETHOD GetElementsByTagName(const nsAString& aTagname,
+ nsIDOMNodeList** aReturn);
+- NS_METHOD GetElementsByTagNameNS(const nsAString& aNamespaceURI,
++ NS_IMETHOD GetElementsByTagNameNS(const nsAString& aNamespaceURI,
+ const nsAString& aLocalName,
+ nsIDOMNodeList** aReturn);
+
+diff -up mozilla/content/svg/content/src/nsSVGForeignObjectElement.h.gcc47 mozilla/content/svg/content/src/nsSVGForeignObjectElement.h
+--- mozilla/content/svg/content/src/nsSVGForeignObjectElement.h.gcc47 2012-03-07 12:00:12.743005254 -0500
++++ mozilla/content/svg/content/src/nsSVGForeignObjectElement.h 2012-03-07 12:00:25.731010669 -0500
+@@ -67,7 +67,7 @@ public:
+ NS_FORWARD_NSIDOMSVGELEMENT(nsSVGForeignObjectElementBase::)
+
+ // nsIContent interface
+- NS_IMETHODIMP_(PRBool) IsAttributeMapped(const nsIAtom* name) const;
++ NS_IMETHOD_(PRBool) IsAttributeMapped(const nsIAtom* name) const;
+
+ virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
+
+diff -up mozilla/content/svg/content/src/nsSVGImageElement.cpp.gcc47 mozilla/content/svg/content/src/nsSVGImageElement.cpp
+--- mozilla/content/svg/content/src/nsSVGImageElement.cpp.gcc47 2012-03-07 11:48:02.593010064 -0500
++++ mozilla/content/svg/content/src/nsSVGImageElement.cpp 2012-03-07 11:48:07.010006173 -0500
+@@ -93,7 +93,7 @@ public:
+
+ virtual PRInt32 IntrinsicState() const;
+
+- NS_IMETHODIMP_(PRBool) IsAttributeMapped(const nsIAtom* name) const;
++ NS_IMETHOD_(PRBool) IsAttributeMapped(const nsIAtom* name) const;
+
+ // nsSVGPathGeometryElement methods:
+ virtual void ConstructPath(gfxContext *aCtx);
+diff -up mozilla/content/svg/content/src/nsSVGLineElement.cpp.gcc47 mozilla/content/svg/content/src/nsSVGLineElement.cpp
+--- mozilla/content/svg/content/src/nsSVGLineElement.cpp.gcc47 2012-03-07 11:50:04.414009413 -0500
++++ mozilla/content/svg/content/src/nsSVGLineElement.cpp 2012-03-07 11:50:09.331005465 -0500
+@@ -64,7 +64,7 @@ public:
+ NS_FORWARD_NSIDOMSVGELEMENT(nsSVGLineElementBase::)
+
+ // nsIContent interface
+- NS_IMETHODIMP_(PRBool) IsAttributeMapped(const nsIAtom* name) const;
++ NS_IMETHOD_(PRBool) IsAttributeMapped(const nsIAtom* name) const;
+
+ // nsSVGPathGeometryElement methods:
+ virtual PRBool IsMarkable() { return PR_TRUE; }
+diff -up mozilla/content/svg/content/src/nsSVGMarkerElement.h.gcc47 mozilla/content/svg/content/src/nsSVGMarkerElement.h
+--- mozilla/content/svg/content/src/nsSVGMarkerElement.h.gcc47 2012-03-07 11:52:50.743012984 -0500
++++ mozilla/content/svg/content/src/nsSVGMarkerElement.h 2012-03-07 11:52:55.356001382 -0500
+@@ -120,7 +120,7 @@ public:
+ nsISVGValue::modificationType aModType);
+
+ // nsIContent interface
+- NS_IMETHODIMP_(PRBool) IsAttributeMapped(const nsIAtom* name) const;
++ NS_IMETHOD_(PRBool) IsAttributeMapped(const nsIAtom* name) const;
+
+ virtual PRBool GetAttr(PRInt32 aNameSpaceID, nsIAtom* aName,
+ nsAString& aResult) const;
+diff -up mozilla/content/svg/content/src/nsSVGPathElement.h.gcc47 mozilla/content/svg/content/src/nsSVGPathElement.h
+--- mozilla/content/svg/content/src/nsSVGPathElement.h.gcc47 2012-03-07 11:53:24.032006461 -0500
++++ mozilla/content/svg/content/src/nsSVGPathElement.h 2012-03-07 11:53:31.712005041 -0500
+@@ -92,7 +92,7 @@ public:
+ NS_FORWARD_NSIDOMSVGELEMENT(nsSVGPathElementBase::)
+
+ // nsIContent interface
+- NS_IMETHODIMP_(PRBool) IsAttributeMapped(const nsIAtom* name) const;
++ NS_IMETHOD_(PRBool) IsAttributeMapped(const nsIAtom* name) const;
+
+ // nsISVGValueObserver
+ NS_IMETHOD DidModifySVGObservable (nsISVGValue* observable,
+diff -up mozilla/content/svg/content/src/nsSVGPatternElement.h.gcc47 mozilla/content/svg/content/src/nsSVGPatternElement.h
+--- mozilla/content/svg/content/src/nsSVGPatternElement.h.gcc47 2012-03-07 11:53:57.429005196 -0500
++++ mozilla/content/svg/content/src/nsSVGPatternElement.h 2012-03-07 11:54:07.708004291 -0500
+@@ -92,7 +92,7 @@ public:
+ NS_FORWARD_NSIDOMSVGELEMENT(nsSVGElement::)
+
+ // nsIContent interface
+- NS_IMETHODIMP_(PRBool) IsAttributeMapped(const nsIAtom* name) const;
++ NS_IMETHOD_(PRBool) IsAttributeMapped(const nsIAtom* name) const;
+
+ virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
+
+diff -up mozilla/content/svg/content/src/nsSVGPoint.cpp.gcc47 mozilla/content/svg/content/src/nsSVGPoint.cpp
+--- mozilla/content/svg/content/src/nsSVGPoint.cpp.gcc47 2012-03-07 11:57:44.264004652 -0500
++++ mozilla/content/svg/content/src/nsSVGPoint.cpp 2012-03-07 11:57:50.938004518 -0500
+@@ -190,9 +190,9 @@ public:
+ }
+
+ // override setters to make the whole object readonly
+- NS_IMETHODIMP SetX(float) { return NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR; }
+- NS_IMETHODIMP SetY(float) { return NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR; }
+- NS_IMETHODIMP SetValueString(const nsAString&) { return NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR; }
++ NS_IMETHOD SetX(float) { return NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR; }
++ NS_IMETHOD SetY(float) { return NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR; }
++ NS_IMETHOD SetValueString(const nsAString&) { return NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR; }
+ };
+
+ nsresult
+diff -up mozilla/content/svg/content/src/nsSVGPolyElement.h.gcc47 mozilla/content/svg/content/src/nsSVGPolyElement.h
+--- mozilla/content/svg/content/src/nsSVGPolyElement.h.gcc47 2012-03-07 11:54:51.540005891 -0500
++++ mozilla/content/svg/content/src/nsSVGPolyElement.h 2012-03-07 11:54:59.764009238 -0500
+@@ -59,7 +59,7 @@ public:
+ NS_DECL_NSIDOMSVGANIMATEDPOINTS
+
+ // nsIContent interface
+- NS_IMETHODIMP_(PRBool) IsAttributeMapped(const nsIAtom* name) const;
++ NS_IMETHOD_(PRBool) IsAttributeMapped(const nsIAtom* name) const;
+
+ // nsSVGPathGeometryElement methods:
+ virtual PRBool IsDependentAttribute(nsIAtom *aName);
+diff -up mozilla/content/svg/content/src/nsSVGRect.cpp.gcc47 mozilla/content/svg/content/src/nsSVGRect.cpp
+--- mozilla/content/svg/content/src/nsSVGRect.cpp.gcc47 2012-03-07 11:58:21.577008504 -0500
++++ mozilla/content/svg/content/src/nsSVGRect.cpp 2012-03-07 11:58:34.405003114 -0500
+@@ -209,11 +209,11 @@ public:
+ }
+
+ // override setters to make the whole object readonly
+- NS_IMETHODIMP SetX(float) { return NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR; }
+- NS_IMETHODIMP SetY(float) { return NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR; }
+- NS_IMETHODIMP SetWidth(float) { return NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR; }
+- NS_IMETHODIMP SetHeight(float) { return NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR; }
+- NS_IMETHODIMP SetValueString(const nsAString&) { return NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR; }
++ NS_IMETHOD SetX(float) { return NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR; }
++ NS_IMETHOD SetY(float) { return NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR; }
++ NS_IMETHOD SetWidth(float) { return NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR; }
++ NS_IMETHOD SetHeight(float) { return NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR; }
++ NS_IMETHOD SetValueString(const nsAString&) { return NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR; }
+ };
+
+ ////////////////////////////////////////////////////////////////////////
+diff -up mozilla/content/svg/content/src/nsSVGSymbolElement.cpp.gcc47 mozilla/content/svg/content/src/nsSVGSymbolElement.cpp
+--- mozilla/content/svg/content/src/nsSVGSymbolElement.cpp.gcc47 2012-03-07 11:59:38.532005552 -0500
++++ mozilla/content/svg/content/src/nsSVGSymbolElement.cpp 2012-03-07 11:59:42.566005192 -0500
+@@ -70,7 +70,7 @@ public:
+ NS_FORWARD_NSIDOMSVGELEMENT(nsSVGElement::)
+
+ // nsIContent interface
+- NS_IMETHODIMP_(PRBool) IsAttributeMapped(const nsIAtom* name) const;
++ NS_IMETHOD_(PRBool) IsAttributeMapped(const nsIAtom* name) const;
+
+ virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
+
+diff -up mozilla/content/xslt/src/xslt/txMozillaXSLTProcessor.h.gcc47 mozilla/content/xslt/src/xslt/txMozillaXSLTProcessor.h
+--- mozilla/content/xslt/src/xslt/txMozillaXSLTProcessor.h.gcc47 2012-03-07 11:43:00.220006507 -0500
++++ mozilla/content/xslt/src/xslt/txMozillaXSLTProcessor.h 2012-03-07 11:43:03.677006336 -0500
+@@ -142,7 +142,7 @@ public:
+ }
+
+ // nsIJSNativeInitializer
+- NS_IMETHODIMP Initialize(nsISupports* aOwner, JSContext *cx, JSObject *obj,
++ NS_IMETHOD Initialize(nsISupports* aOwner, JSContext *cx, JSObject *obj,
+ PRUint32 argc, jsval *argv);
+
+ static nsresult Startup();
+diff -up mozilla/editor/libeditor/html/nsHTMLEditor.h.gcc47 mozilla/editor/libeditor/html/nsHTMLEditor.h
+--- mozilla/editor/libeditor/html/nsHTMLEditor.h.gcc47 2012-03-07 12:04:49.017007854 -0500
++++ mozilla/editor/libeditor/html/nsHTMLEditor.h 2012-03-07 12:05:03.573005849 -0500
+@@ -145,9 +145,9 @@ public:
+ virtual ~nsHTMLEditor();
+
+ /* ------------ nsPlaintextEditor overrides -------------- */
+- NS_IMETHODIMP HandleKeyPress(nsIDOMKeyEvent* aKeyEvent);
++ NS_IMETHOD HandleKeyPress(nsIDOMKeyEvent* aKeyEvent);
+ NS_IMETHOD GetIsDocumentEditable(PRBool *aIsDocumentEditable);
+- NS_IMETHODIMP BeginningOfDocument();
++ NS_IMETHOD BeginningOfDocument();
+
+ /* ------------ nsIHTMLEditor methods -------------- */
+
+@@ -360,8 +360,8 @@ public:
+
+ virtual PRBool NodesSameType(nsIDOMNode *aNode1, nsIDOMNode *aNode2);
+
+- NS_IMETHODIMP DeleteNode(nsIDOMNode * aNode);
+- NS_IMETHODIMP DeleteText(nsIDOMCharacterData *aTextNode,
++ NS_IMETHOD DeleteNode(nsIDOMNode * aNode);
++ NS_IMETHOD DeleteText(nsIDOMCharacterData *aTextNode,
+ PRUint32 aOffset,
+ PRUint32 aLength);
+ NS_IMETHOD InsertTextImpl(const nsAString& aStringToInsert,
+diff -up mozilla/extensions/wallet/src/singsign.cpp.gcc47 mozilla/extensions/wallet/src/singsign.cpp
+--- mozilla/extensions/wallet/src/singsign.cpp.gcc47 2012-03-07 14:41:12.687006164 -0500
++++ mozilla/extensions/wallet/src/singsign.cpp 2012-03-07 14:41:16.409005330 -0500
+@@ -1823,7 +1823,7 @@ public:
+
+ NS_DECL_ISUPPORTS
+
+- NS_IMETHODIMP Observe(nsISupports*, const char *aTopic, const PRUnichar *someData)
++ NS_IMETHOD Observe(nsISupports*, const char *aTopic, const PRUnichar *someData)
+ {
+ if (!strcmp(aTopic, "profile-before-change")) {
+ SI_ClearUserData();
+diff -up mozilla/intl/unicharutil/src/nsSaveAsCharset.h.gcc47 mozilla/intl/unicharutil/src/nsSaveAsCharset.h
+--- mozilla/intl/unicharutil/src/nsSaveAsCharset.h.gcc47 2012-03-07 10:36:47.752004820 -0500
++++ mozilla/intl/unicharutil/src/nsSaveAsCharset.h 2012-03-07 10:36:52.887006988 -0500
+@@ -74,7 +74,7 @@ public:
+
+ NS_IMETHOD Convert(const PRUnichar *inString, char **_retval);
+
+- NS_IMETHODIMP GetCharset(char * *aCharset);
++ NS_IMETHOD GetCharset(char * *aCharset);
+
+ protected:
+
+diff -up mozilla/js/src/xpconnect/src/nsXPConnect.cpp.gcc47 mozilla/js/src/xpconnect/src/nsXPConnect.cpp
+--- mozilla/js/src/xpconnect/src/nsXPConnect.cpp.gcc47 2012-03-07 10:48:46.884007199 -0500
++++ mozilla/js/src/xpconnect/src/nsXPConnect.cpp 2012-03-07 10:48:50.731001424 -0500
+@@ -1001,7 +1001,7 @@ public:
+ {
+ return NS_OK;
+ }
+- NS_IMETHODIMP Traverse(void *n, nsCycleCollectionTraversalCallback &cb)
++ NS_IMETHOD Traverse(void *n, nsCycleCollectionTraversalCallback &cb)
+ {
+ JSContext *cx = static_cast<JSContext*>(n);
+
+diff -up mozilla/layout/generic/nsInlineFrame.h.gcc47 mozilla/layout/generic/nsInlineFrame.h
+--- mozilla/layout/generic/nsInlineFrame.h.gcc47 2012-03-07 13:30:11.675010902 -0500
++++ mozilla/layout/generic/nsInlineFrame.h 2012-03-07 13:30:15.228007305 -0500
+@@ -90,7 +90,7 @@ public:
+ const nsDisplayListSet& aLists);
+
+ #ifdef ACCESSIBILITY
+- NS_IMETHODIMP GetAccessible(nsIAccessible** aAccessible);
++ NS_IMETHOD GetAccessible(nsIAccessible** aAccessible);
+ #endif
+
+ #ifdef DEBUG
+diff -up mozilla/layout/xul/base/public/nsXULPopupManager.h.gcc47 mozilla/layout/xul/base/public/nsXULPopupManager.h
+--- mozilla/layout/xul/base/public/nsXULPopupManager.h.gcc47 2012-03-07 11:10:57.922002531 -0500
++++ mozilla/layout/xul/base/public/nsXULPopupManager.h 2012-03-07 11:11:03.161006431 -0500
+@@ -580,7 +580,7 @@ public:
+ return HandleKeyboardNavigationInPopup(nsnull, aFrame, aDir);
+ }
+
+- NS_IMETHODIMP HandleEvent(nsIDOMEvent* aEvent) { return NS_OK; }
++ NS_IMETHOD HandleEvent(nsIDOMEvent* aEvent) { return NS_OK; }
+
+ NS_IMETHOD KeyUp(nsIDOMEvent* aKeyEvent);
+ NS_IMETHOD KeyDown(nsIDOMEvent* aKeyEvent);
+diff -up mozilla/mailnews/base/util/nsMsgProtocol.cpp.gcc47 mozilla/mailnews/base/util/nsMsgProtocol.cpp
+--- mozilla/mailnews/base/util/nsMsgProtocol.cpp.gcc47 2012-03-07 14:46:41.364010634 -0500
++++ mozilla/mailnews/base/util/nsMsgProtocol.cpp 2012-03-07 14:46:48.349008732 -0500
+@@ -985,7 +985,7 @@ public:
+ //
+ // nsIOutputStreamCallback implementation ...
+ //
+- NS_IMETHODIMP OnOutputStreamReady(nsIAsyncOutputStream *aOutStream)
++ NS_IMETHOD OnOutputStreamReady(nsIAsyncOutputStream *aOutStream)
+ {
+ NS_ASSERTION(mInStream, "not initialized");
+
+diff -up mozilla/mailnews/imap/src/nsImapMailFolder.h.gcc47 mozilla/mailnews/imap/src/nsImapMailFolder.h
+--- mozilla/mailnews/imap/src/nsImapMailFolder.h.gcc47 2012-03-07 14:58:23.004005101 -0500
++++ mozilla/mailnews/imap/src/nsImapMailFolder.h 2012-03-07 14:58:29.208005237 -0500
+@@ -235,7 +235,7 @@ public:
+
+ NS_IMETHOD CreateSubfolder(const nsAString& folderName,nsIMsgWindow *msgWindow );
+ NS_IMETHOD AddSubfolder(const nsAString& aName, nsIMsgFolder** aChild);
+- NS_IMETHODIMP CreateStorageIfMissing(nsIUrlListener* urlListener);
++ NS_IMETHOD CreateStorageIfMissing(nsIUrlListener* urlListener);
+
+ NS_IMETHOD Compact(nsIUrlListener *aListener, nsIMsgWindow *aMsgWindow);
+ NS_IMETHOD CompactAll(nsIUrlListener *aListener, nsIMsgWindow *aMsgWindow, nsISupportsArray *aFolderArray,
+diff -up mozilla/mailnews/import/src/nsImportMail.cpp.gcc47 mozilla/mailnews/import/src/nsImportMail.cpp
+--- mozilla/mailnews/import/src/nsImportMail.cpp.gcc47 2012-03-07 15:01:23.329005030 -0500
++++ mozilla/mailnews/import/src/nsImportMail.cpp 2012-03-07 15:01:30.462006681 -0500
+@@ -103,7 +103,7 @@ public:
+ NS_IMETHOD WantsProgress(PRBool *_retval);
+
+ /* boolean BeginImport (in nsISupportsString successLog, in nsISupportsString errorLog, in boolean isAddrLocHome); */
+- NS_IMETHODIMP BeginImport(nsISupportsString *successLog, nsISupportsString *errorLog, PRBool isAddrLocHome, PRBool *_retval) ;
++ NS_IMETHOD BeginImport(nsISupportsString *successLog, nsISupportsString *errorLog, PRBool isAddrLocHome, PRBool *_retval) ;
+
+ /* boolean ContinueImport (); */
+ NS_IMETHOD ContinueImport(PRBool *_retval);
+diff -up mozilla/mailnews/news/src/nsNntpIncomingServer.h.gcc47 mozilla/mailnews/news/src/nsNntpIncomingServer.h
+--- mozilla/mailnews/news/src/nsNntpIncomingServer.h.gcc47 2012-03-07 14:51:24.691006677 -0500
++++ mozilla/mailnews/news/src/nsNntpIncomingServer.h 2012-03-07 14:51:30.679006614 -0500
+@@ -88,7 +88,7 @@ public:
+ virtual PRInt32 HandleLine(const char *line, PRUint32 line_size);
+
+ // override to clear all passwords associated with server
+- NS_IMETHODIMP ForgetPassword();
++ NS_IMETHOD ForgetPassword();
+ NS_IMETHOD GetCanSearchMessages(PRBool *canSearchMessages);
+ NS_IMETHOD GetOfflineSupportLevel(PRInt32 *aSupportLevel);
+ NS_IMETHOD GetDefaultCopiesAndFoldersPrefsToServer(PRBool *aCopiesAndFoldersOnServer);
+diff -up mozilla/modules/libpref/src/nsPref.cpp.gcc47 mozilla/modules/libpref/src/nsPref.cpp
+--- mozilla/modules/libpref/src/nsPref.cpp.gcc47 2005-12-31 07:14:36.000000000 -0500
++++ mozilla/modules/libpref/src/nsPref.cpp 2012-03-07 10:33:13.346006713 -0500
+@@ -101,17 +101,17 @@ public:
+
+ NS_IMETHOD CopyCharPref(const char *pref, char ** return_buf);
+
+- NS_IMETHODIMP GetDefaultBoolPref(const char *pref, PRBool *_retval)
++ NS_IMETHOD GetDefaultBoolPref(const char *pref, PRBool *_retval)
+ { return mDefaultBranch->GetBoolPref(pref, _retval); }
+- NS_IMETHODIMP CopyDefaultCharPref(const char *pref, char **_retval)
++ NS_IMETHOD CopyDefaultCharPref(const char *pref, char **_retval)
+ { return mDefaultBranch->GetCharPref(pref, _retval); }
+- NS_IMETHODIMP GetDefaultIntPref(const char *pref, PRInt32 *_retval)
++ NS_IMETHOD GetDefaultIntPref(const char *pref, PRInt32 *_retval)
+ { return mDefaultBranch->GetIntPref(pref, _retval); }
+- NS_IMETHODIMP SetDefaultBoolPref(const char *pref, PRBool value)
++ NS_IMETHOD SetDefaultBoolPref(const char *pref, PRBool value)
+ { return mDefaultBranch->SetBoolPref(pref, value); }
+- NS_IMETHODIMP SetDefaultCharPref(const char *pref, const char *value)
++ NS_IMETHOD SetDefaultCharPref(const char *pref, const char *value)
+ { return mDefaultBranch->SetCharPref(pref, value); }
+- NS_IMETHODIMP SetDefaultIntPref(const char *pref, PRInt32 value)
++ NS_IMETHOD SetDefaultIntPref(const char *pref, PRInt32 value)
+ { return mDefaultBranch->SetIntPref(pref, value); }
+
+ NS_IMETHOD CopyUnicharPref(const char *pref, PRUnichar **_retval);
+diff -up mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp.gcc47 mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
+--- mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp.gcc47 2012-03-07 11:06:14.330009667 -0500
++++ mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp 2012-03-07 11:06:55.963005551 -0500
+@@ -4286,26 +4286,26 @@ public:
+ virtual ~DOMMimeTypeImpl() {
+ }
+
+- NS_METHOD GetDescription(nsAString& aDescription)
++ NS_IMETHOD GetDescription(nsAString& aDescription)
+ {
+ aDescription.Assign(mDescription);
+ return NS_OK;
+ }
+
+- NS_METHOD GetEnabledPlugin(nsIDOMPlugin** aEnabledPlugin)
++ NS_IMETHOD GetEnabledPlugin(nsIDOMPlugin** aEnabledPlugin)
+ {
+ // this has to be implemented by the DOM version.
+ *aEnabledPlugin = nsnull;
+ return NS_OK;
+ }
+
+- NS_METHOD GetSuffixes(nsAString& aSuffixes)
++ NS_IMETHOD GetSuffixes(nsAString& aSuffixes)
+ {
+ aSuffixes.Assign(mSuffixes);
+ return NS_OK;
+ }
+
+- NS_METHOD GetType(nsAString& aType)
++ NS_IMETHOD GetType(nsAString& aType)
+ {
+ aType.Assign(mType);
+ return NS_OK;
+@@ -4332,13 +4332,13 @@ public:
+ virtual ~DOMPluginImpl() {
+ }
+
+- NS_METHOD GetDescription(nsAString& aDescription)
++ NS_IMETHOD GetDescription(nsAString& aDescription)
+ {
+ CopyUTF8toUTF16(mPluginTag.mDescription, aDescription);
+ return NS_OK;
+ }
+
+- NS_METHOD GetFilename(nsAString& aFilename)
++ NS_IMETHOD GetFilename(nsAString& aFilename)
+ {
+ PRBool bShowPath;
+ nsCOMPtr<nsIPrefBranch> prefService = do_GetService(NS_PREFSERVICE_CONTRACTID);
+@@ -4376,19 +4376,19 @@ public:
+ return pluginPath->GetLeafName(aFilename);
+ }
+
+- NS_METHOD GetName(nsAString& aName)
++ NS_IMETHOD GetName(nsAString& aName)
+ {
+ CopyUTF8toUTF16(mPluginTag.mName, aName);
+ return NS_OK;
+ }
+
+- NS_METHOD GetLength(PRUint32* aLength)
++ NS_IMETHOD GetLength(PRUint32* aLength)
+ {
+ *aLength = mPluginTag.mVariants;
+ return NS_OK;
+ }
+
+- NS_METHOD Item(PRUint32 aIndex, nsIDOMMimeType** aReturn)
++ NS_IMETHOD Item(PRUint32 aIndex, nsIDOMMimeType** aReturn)
+ {
+ nsIDOMMimeType* mimeType = new DOMMimeTypeImpl(&mPluginTag, aIndex);
+ NS_IF_ADDREF(mimeType);
+@@ -4396,7 +4396,7 @@ public:
+ return NS_OK;
+ }
+
+- NS_METHOD NamedItem(const nsAString& aName, nsIDOMMimeType** aReturn)
++ NS_IMETHOD NamedItem(const nsAString& aName, nsIDOMMimeType** aReturn)
+ {
+ for (int i = mPluginTag.mVariants - 1; i >= 0; --i) {
+ if (aName.Equals(NS_ConvertUTF8toUTF16(mPluginTag.mMimeTypeArray[i])))
+diff -up mozilla/netwerk/base/src/nsFileStreams.h.gcc47 mozilla/netwerk/base/src/nsFileStreams.h
+--- mozilla/netwerk/base/src/nsFileStreams.h.gcc47 2012-03-07 10:40:11.326006430 -0500
++++ mozilla/netwerk/base/src/nsFileStreams.h 2012-03-07 10:40:19.256003724 -0500
+@@ -167,9 +167,9 @@ public:
+
+ virtual ~nsSafeFileOutputStream() { nsSafeFileOutputStream::Close(); }
+
+- NS_IMETHODIMP Close();
+- NS_IMETHODIMP Write(const char *buf, PRUint32 count, PRUint32 *result);
+- NS_IMETHODIMP Init(nsIFile* file, PRInt32 ioFlags, PRInt32 perm, PRInt32 behaviorFlags);
++ NS_IMETHOD Close();
++ NS_IMETHOD Write(const char *buf, PRUint32 count, PRUint32 *result);
++ NS_IMETHOD Init(nsIFile* file, PRInt32 ioFlags, PRInt32 perm, PRInt32 behaviorFlags);
+
+ protected:
+ nsCOMPtr<nsIFile> mTargetFile;
+diff -up mozilla/netwerk/protocol/file/src/nsFileChannel.cpp.gcc47 mozilla/netwerk/protocol/file/src/nsFileChannel.cpp
+--- mozilla/netwerk/protocol/file/src/nsFileChannel.cpp.gcc47 2012-03-07 10:44:08.501005385 -0500
++++ mozilla/netwerk/protocol/file/src/nsFileChannel.cpp 2012-03-07 10:44:17.473012394 -0500
+@@ -206,9 +206,9 @@ public:
+ return mCopyEvent != nsnull;
+ }
+
+- NS_IMETHODIMP ReadSegments(nsWriteSegmentFun fun, void *closure,
++ NS_IMETHOD ReadSegments(nsWriteSegmentFun fun, void *closure,
+ PRUint32 count, PRUint32 *result);
+- NS_IMETHODIMP AsyncWait(nsIInputStreamCallback *callback, PRUint32 flags,
++ NS_IMETHOD AsyncWait(nsIInputStreamCallback *callback, PRUint32 flags,
+ PRUint32 count, nsIEventTarget *target);
+
+ private:
+diff -up mozilla/parser/htmlparser/src/nsParser.h.gcc47 mozilla/parser/htmlparser/src/nsParser.h
+--- mozilla/parser/htmlparser/src/nsParser.h.gcc47 2012-03-07 10:58:02.335002393 -0500
++++ mozilla/parser/htmlparser/src/nsParser.h 2012-03-07 10:58:05.699004018 -0500
+@@ -332,7 +332,7 @@ class nsParser : public nsIParser,
+ * @update kmcclusk 5/18/98
+ */
+
+- NS_IMETHODIMP CancelParsingEvents();
++ NS_IMETHOD CancelParsingEvents();
+
+ /**
+ * Indicates whether the parser is in a state where it
+diff -up mozilla/toolkit/components/downloads/src/nsDownloadProxy.h.gcc47 mozilla/toolkit/components/downloads/src/nsDownloadProxy.h
+--- mozilla/toolkit/components/downloads/src/nsDownloadProxy.h.gcc47 2012-03-07 14:29:58.276006314 -0500
++++ mozilla/toolkit/components/downloads/src/nsDownloadProxy.h 2012-03-07 14:32:33.305005246 -0500
+@@ -59,7 +59,7 @@ public:
+
+ NS_DECL_ISUPPORTS
+
+- NS_IMETHODIMP Init(nsIURI* aSource,
++ NS_IMETHOD Init(nsIURI* aSource,
+ nsIURI* aTarget,
+ const nsAString& aDisplayName,
+ nsIMIMEInfo *aMIMEInfo,
+@@ -111,7 +111,7 @@ public:
+ return rv;
+ }
+
+- NS_IMETHODIMP OnStateChange(nsIWebProgress* aWebProgress,
++ NS_IMETHOD OnStateChange(nsIWebProgress* aWebProgress,
+ nsIRequest* aRequest, PRUint32 aStateFlags,
+ PRUint32 aStatus)
+ {
+@@ -119,7 +119,7 @@ public:
+ return mInner->OnStateChange(aWebProgress, aRequest, aStateFlags, aStatus);
+ }
+
+- NS_IMETHODIMP OnStatusChange(nsIWebProgress *aWebProgress,
++ NS_IMETHOD OnStatusChange(nsIWebProgress *aWebProgress,
+ nsIRequest *aRequest, nsresult aStatus,
+ const PRUnichar *aMessage)
+ {
+@@ -127,14 +127,14 @@ public:
+ return mInner->OnStatusChange(aWebProgress, aRequest, aStatus, aMessage);
+ }
+
+- NS_IMETHODIMP OnLocationChange(nsIWebProgress *aWebProgress,
++ NS_IMETHOD OnLocationChange(nsIWebProgress *aWebProgress,
+ nsIRequest *aRequest, nsIURI *aLocation)
+ {
+ NS_ENSURE_TRUE(mInner, NS_ERROR_NOT_INITIALIZED);
+ return mInner->OnLocationChange(aWebProgress, aRequest, aLocation);
+ }
+
+- NS_IMETHODIMP OnProgressChange(nsIWebProgress *aWebProgress,
++ NS_IMETHOD OnProgressChange(nsIWebProgress *aWebProgress,
+ nsIRequest *aRequest,
+ PRInt32 aCurSelfProgress,
+ PRInt32 aMaxSelfProgress,
+@@ -149,7 +149,7 @@ public:
+ aMaxTotalProgress);
+ }
+
+- NS_IMETHODIMP OnProgressChange64(nsIWebProgress *aWebProgress,
++ NS_IMETHOD OnProgressChange64(nsIWebProgress *aWebProgress,
+ nsIRequest *aRequest,
+ PRInt64 aCurSelfProgress,
+ PRInt64 aMaxSelfProgress,
+@@ -164,7 +164,7 @@ public:
+ aMaxTotalProgress);
+ }
+
+- NS_IMETHODIMP OnRefreshAttempted(nsIWebProgress *aWebProgress,
++ NS_IMETHOD OnRefreshAttempted(nsIWebProgress *aWebProgress,
+ nsIURI *aUri,
+ PRInt32 aDelay,
+ PRBool aSameUri,
+@@ -174,7 +174,7 @@ public:
+ return NS_OK;
+ }
+
+- NS_IMETHODIMP OnSecurityChange(nsIWebProgress *aWebProgress,
++ NS_IMETHOD OnSecurityChange(nsIWebProgress *aWebProgress,
+ nsIRequest *aRequest, PRUint32 aState)
+ {
+ NS_ENSURE_TRUE(mInner, NS_ERROR_NOT_INITIALIZED);
+diff -up mozilla/widget/src/gtk2/nsFilePicker.h.gcc47 mozilla/widget/src/gtk2/nsFilePicker.h
+--- mozilla/widget/src/gtk2/nsFilePicker.h.gcc47 2012-03-07 11:16:52.493006669 -0500
++++ mozilla/widget/src/gtk2/nsFilePicker.h 2012-03-07 11:17:19.982005043 -0500
+@@ -58,19 +58,19 @@ public:
+ NS_DECL_ISUPPORTS
+
+ // nsIFilePicker (less what's in nsBaseFilePicker)
+- NS_IMETHODIMP Init(nsIDOMWindow *aParent, const nsAString &aTitle, PRInt16 aMode);
+- NS_IMETHODIMP AppendFilters(PRInt32 aFilterMask);
+- NS_IMETHODIMP AppendFilter(const nsAString& aTitle, const nsAString& aFilter);
+- NS_IMETHODIMP SetDefaultString(const nsAString& aString);
+- NS_IMETHODIMP GetDefaultString(nsAString& aString);
+- NS_IMETHODIMP SetDefaultExtension(const nsAString& aExtension);
+- NS_IMETHODIMP GetDefaultExtension(nsAString& aExtension);
+- NS_IMETHODIMP GetFilterIndex(PRInt32 *aFilterIndex);
+- NS_IMETHODIMP SetFilterIndex(PRInt32 aFilterIndex);
+- NS_IMETHODIMP GetFile(nsILocalFile **aFile);
+- NS_IMETHODIMP GetFileURL(nsIURI **aFileURL);
+- NS_IMETHODIMP GetFiles(nsISimpleEnumerator **aFiles);
+- NS_IMETHODIMP Show(PRInt16 *aReturn);
++ NS_IMETHOD Init(nsIDOMWindow *aParent, const nsAString &aTitle, PRInt16 aMode);
++ NS_IMETHOD AppendFilters(PRInt32 aFilterMask);
++ NS_IMETHOD AppendFilter(const nsAString& aTitle, const nsAString& aFilter);
++ NS_IMETHOD SetDefaultString(const nsAString& aString);
++ NS_IMETHOD GetDefaultString(nsAString& aString);
++ NS_IMETHOD SetDefaultExtension(const nsAString& aExtension);
++ NS_IMETHOD GetDefaultExtension(nsAString& aExtension);
++ NS_IMETHOD GetFilterIndex(PRInt32 *aFilterIndex);
++ NS_IMETHOD SetFilterIndex(PRInt32 aFilterIndex);
++ NS_IMETHOD GetFile(nsILocalFile **aFile);
++ NS_IMETHOD GetFileURL(nsIURI **aFileURL);
++ NS_IMETHOD GetFiles(nsISimpleEnumerator **aFiles);
++ NS_IMETHOD Show(PRInt16 *aReturn);
+
+ virtual void InitNative(nsIWidget *aParent, const nsAString& aTitle, PRInt16 aMode);
+
+diff -up mozilla/widget/src/gtk2/nsNativeThemeGTK.h.gcc47 mozilla/widget/src/gtk2/nsNativeThemeGTK.h
+--- mozilla/widget/src/gtk2/nsNativeThemeGTK.h.gcc47 2012-03-07 11:20:53.293006929 -0500
++++ mozilla/widget/src/gtk2/nsNativeThemeGTK.h 2012-03-07 11:23:21.827007189 -0500
+@@ -81,13 +81,13 @@ public:
+
+ NS_IMETHOD ThemeChanged();
+
+- NS_IMETHOD_(PRBool) ThemeSupportsWidget(nsPresContext* aPresContext,
++ virtual PRBool ThemeSupportsWidget(nsPresContext* aPresContext,
+ nsIFrame* aFrame,
+ PRUint8 aWidgetType);
+
+- NS_IMETHOD_(PRBool) WidgetIsContainer(PRUint8 aWidgetType);
++ virtual PRBool WidgetIsContainer(PRUint8 aWidgetType);
+
+- NS_IMETHOD_(PRBool) ThemeDrawsFocusForWidget(nsPresContext* aPresContext,
++ virtual PRBool ThemeDrawsFocusForWidget(nsPresContext* aPresContext,
+ nsIFrame* aFrame, PRUint8 aWidgetType);
+
+ PRBool ThemeNeedsComboboxDropmarker();
+diff -up mozilla/widget/src/gtk2/nsPrintDialogGTK.h.gcc47 mozilla/widget/src/gtk2/nsPrintDialogGTK.h
+--- mozilla/widget/src/gtk2/nsPrintDialogGTK.h.gcc47 2012-03-07 11:20:31.677007636 -0500
++++ mozilla/widget/src/gtk2/nsPrintDialogGTK.h 2012-03-07 11:20:40.543011124 -0500
+@@ -50,9 +50,9 @@ public:
+
+ NS_DECL_ISUPPORTS
+
+- NS_IMETHODIMP Init();
+- NS_IMETHODIMP Show(nsIDOMWindow *aParent, nsIPrintSettings *aSettings);
+- NS_IMETHODIMP ShowPageSetup(nsIDOMWindow *aParent,
++ NS_IMETHOD Init();
++ NS_IMETHOD Show(nsIDOMWindow *aParent, nsIPrintSettings *aSettings);
++ NS_IMETHOD ShowPageSetup(nsIDOMWindow *aParent,
+ nsIPrintSettings *aSettings);
+ };
+
diff -up mozilla/xpcom/glue/nsBaseHashtable.h.gcc47 mozilla/xpcom/glue/nsBaseHashtable.h
--- mozilla/xpcom/glue/nsBaseHashtable.h.gcc47 2007-10-19 19:26:52.000000000 -0400
-+++ mozilla/xpcom/glue/nsBaseHashtable.h 2012-03-06 15:00:42.378617209 -0500
++++ mozilla/xpcom/glue/nsBaseHashtable.h 2012-03-07 10:33:13.348006713 -0500
@@ -123,7 +123,7 @@ public:
*/
PRBool Get(KeyType aKey, UserDataType* pData) const
@@ -30,7 +644,7 @@ diff -up mozilla/xpcom/glue/nsBaseHashtable.h.gcc47 mozilla/xpcom/glue/nsBaseHas
* function type provided by the application for enumeration.
diff -up mozilla/xpcom/glue/nsClassHashtable.h.gcc47 mozilla/xpcom/glue/nsClassHashtable.h
--- mozilla/xpcom/glue/nsClassHashtable.h.gcc47 2005-08-11 15:42:37.000000000 -0400
-+++ mozilla/xpcom/glue/nsClassHashtable.h 2012-03-06 15:00:42.380617188 -0500
++++ mozilla/xpcom/glue/nsClassHashtable.h 2012-03-07 10:33:13.494006715 -0500
@@ -98,7 +98,7 @@ PRBool
nsClassHashtable<KeyClass,T>::Get(KeyType aKey, T** retVal) const
{
@@ -42,7 +656,7 @@ diff -up mozilla/xpcom/glue/nsClassHashtable.h.gcc47 mozilla/xpcom/glue/nsClassH
{
diff -up mozilla/xpcom/glue/nsInterfaceHashtable.h.gcc47 mozilla/xpcom/glue/nsInterfaceHashtable.h
--- mozilla/xpcom/glue/nsInterfaceHashtable.h.gcc47 2005-08-11 15:42:48.000000000 -0400
-+++ mozilla/xpcom/glue/nsInterfaceHashtable.h 2012-03-06 15:00:42.381617177 -0500
++++ mozilla/xpcom/glue/nsInterfaceHashtable.h 2012-03-07 10:33:13.657006749 -0500
@@ -111,7 +111,7 @@ nsInterfaceHashtable<KeyClass,Interface>
(KeyType aKey, UserDataType* pInterface) const
{
@@ -62,8 +676,8 @@ diff -up mozilla/xpcom/glue/nsInterfaceHashtable.h.gcc47 mozilla/xpcom/glue/nsIn
if (ent)
{
diff -up mozilla/xpcom/glue/nsRefPtrHashtable.h.gcc47 mozilla/xpcom/glue/nsRefPtrHashtable.h
---- mozilla/xpcom/glue/nsRefPtrHashtable.h.gcc47 2012-03-06 15:02:14.040765752 -0500
-+++ mozilla/xpcom/glue/nsRefPtrHashtable.h 2012-03-06 15:12:31.997171168 -0500
+--- mozilla/xpcom/glue/nsRefPtrHashtable.h.gcc47 2005-08-11 15:42:51.000000000 -0400
++++ mozilla/xpcom/glue/nsRefPtrHashtable.h 2012-03-07 10:33:13.714006722 -0500
@@ -112,7 +112,7 @@ nsRefPtrHashtable<KeyClass,RefPtr>::Get
(KeyType aKey, UserDataType* pRefPtr) const
{
@@ -83,8 +697,8 @@ diff -up mozilla/xpcom/glue/nsRefPtrHashtable.h.gcc47 mozilla/xpcom/glue/nsRefPt
if (ent)
{
diff -up mozilla/xpcom/glue/nsTPtrArray.h.gcc47 mozilla/xpcom/glue/nsTPtrArray.h
---- mozilla/xpcom/glue/nsTPtrArray.h.gcc47 2012-03-06 15:19:40.235614834 -0500
-+++ mozilla/xpcom/glue/nsTPtrArray.h 2012-03-06 15:19:49.312539417 -0500
+--- mozilla/xpcom/glue/nsTPtrArray.h.gcc47 2007-07-08 03:08:51.000000000 -0400
++++ mozilla/xpcom/glue/nsTPtrArray.h 2012-03-07 10:33:13.750006692 -0500
@@ -64,7 +64,7 @@ class nsTPtrArray : public nsTArray<E*>
// Initialize this array and pre-allocate some number of elements.
@@ -94,3 +708,15 @@ diff -up mozilla/xpcom/glue/nsTPtrArray.h.gcc47 mozilla/xpcom/glue/nsTPtrArray.h
}
// The array's copy-constructor performs a 'deep' copy of the given array.
+diff -up mozilla/xpcom/io/nsFastLoadFile.h.gcc47 mozilla/xpcom/io/nsFastLoadFile.h
+--- mozilla/xpcom/io/nsFastLoadFile.h.gcc47 2007-07-08 03:08:51.000000000 -0400
++++ mozilla/xpcom/io/nsFastLoadFile.h 2012-03-07 10:33:13.764006784 -0500
+@@ -296,7 +296,7 @@ class nsFastLoadFileReader
+ // Override ReadSegments too, as nsBinaryInputStream::ReadSegments does
+ // not call through our overridden Read method -- it calls directly into
+ // the underlying input stream.
+- NS_IMETHODIMP ReadSegments(nsWriteSegmentFun aWriter, void* aClosure,
++ NS_IMETHOD ReadSegments(nsWriteSegmentFun aWriter, void* aClosure,
+ PRUint32 aCount, PRUint32 *aResult);
+
+ // Override SetInputStream so we can update mSeekableInput
More information about the scm-commits
mailing list