From 2fdce1f62b33daf94cbdd3bdce207bcee69de504 Mon Sep 17 00:00:00 2001
From: "jband%netscape.com"
 <jband%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sun, 6 Feb 2000 01:09:15 +0000
Subject: [PATCH] fix incorrectly declared callback and its evil (cast) that
 were crashing my release builds of xpcshell and viewer. r=dougt

git-svn-id: svn://10.0.0.236/trunk@59912 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/xpinstall/src/nsSoftwareUpdate.cpp | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/mozilla/xpinstall/src/nsSoftwareUpdate.cpp b/mozilla/xpinstall/src/nsSoftwareUpdate.cpp
index dcd772d8f73..fa438c9958b 100644
--- a/mozilla/xpinstall/src/nsSoftwareUpdate.cpp
+++ b/mozilla/xpinstall/src/nsSoftwareUpdate.cpp
@@ -456,7 +456,7 @@ nsSoftwareUpdateNameSet::AddNameSet(nsIScriptContext* aScriptContext)
 // Functions used to create new instances of a given object by the
 // generic factory.
 
-static NS_IMETHODIMP      
+static NS_METHOD      
 CreateNewSoftwareUpdate(nsISupports* aOuter, REFNSIID aIID, void **aResult)
 {                                                                  
     if (!aResult) {                                                
@@ -483,10 +483,11 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsInstallVersion);
 
 
 
-nsresult RegisterSoftwareUpdate( nsIComponentManager *aCompMgr,
-                                 nsIFile *aPath,
-                                 const char *registryLocation,
-                                 const char *componentType)
+static NS_METHOD 
+RegisterSoftwareUpdate( nsIComponentManager *aCompMgr,
+                        nsIFile *aPath,
+                        const char *registryLocation,
+                        const char *componentType)
 {
 	// get the registry
     nsIRegistry* registry;
@@ -523,19 +524,19 @@ static nsModuleComponentInfo components[] =
 	   NS_SoftwareUpdate_CID,
        NS_IXPINSTALLCOMPONENT_PROGID,
 	   CreateNewSoftwareUpdate,
-	   (NSRegisterSelfProcPtr)RegisterSoftwareUpdate,
+	   RegisterSoftwareUpdate
 	},
 	   
     { "InstallTrigger Component", 
 	   NS_SoftwareUpdateInstallTrigger_CID,
        NS_INSTALLTRIGGERCOMPONENT_PROGID, 
-	   nsInstallTriggerConstructor,
+	   nsInstallTriggerConstructor
 	},
     
 	{ "InstallVersion Component", 
 	   NS_SoftwareUpdateInstallVersion_CID,
-       NS_INSTALLVERSIONCOMPONENT_PROGID, 
-	   nsInstallVersionConstructor,
+       NS_INSTALLVERSIONCOMPONENT_PROGID,
+	   nsInstallVersionConstructor 
 	},
 };