Bug 583865 - Latest xulrunner doesn't compile with Maemo 6 defined. r=romaxa. approval=dougt. maemo build bustage fix
authorJukka Miettinen <jukka.miettinen@gmail.com>
Tue, 03 Aug 2010 03:02:48 +0300
changeset 48752 7d585449b051f452da74e2ef94725e1bc2b74c68
parent 48751 7da39af0206fdfc124d04ce02da5b297ff700db8
child 48753 daeaf3e519d7090c5eba0c196fecb2c87a643ee5
push id14798
push userromaxa@gmail.com
push dateTue, 03 Aug 2010 01:09:16 +0000
treeherderautoland@7d585449b051 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersromaxa
bugs583865
milestone2.0b3pre
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
Bug 583865 - Latest xulrunner doesn't compile with Maemo 6 defined. r=romaxa. approval=dougt. maemo build bustage fix
uriloader/exthandler/nsContentHandlerApp.cpp
--- a/uriloader/exthandler/nsContentHandlerApp.cpp
+++ b/uriloader/exthandler/nsContentHandlerApp.cpp
@@ -34,22 +34,21 @@
  * 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 "nsContentHandlerApp.h"
 #include "nsIURI.h"
-#include "nsIGenericFactory.h"
 #include "nsIClassInfoImpl.h"
 #include "nsCOMPtr.h"
 #include "nsString.h"
 
-NS_IMPL_ISUPPORTS1_CI(nsContentHandlerApp, nsIHandlerApp)
+NS_IMPL_ISUPPORTS1(nsContentHandlerApp, nsIHandlerApp)
 
 nsContentHandlerApp::nsContentHandlerApp(nsString aName, nsCString aType,
                                          ContentAction::Action& aAction) :
   mName(aName),
   mType(aType),
   mAction(aAction)
 {
 }
@@ -102,10 +101,8 @@ nsContentHandlerApp::LaunchWithURI(nsIUR
       actions[i].trigger();
       break;
     }
   }
 
   return NS_OK;
 }
 
-NS_DECL_CLASSINFO(nsContentHandlerApp)
-