From a961540bb04f4a5781f561ad7e44f20693e2e79b Mon Sep 17 00:00:00 2001
From: "timeless%mozdev.org"
 <timeless%mozdev.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 16 Jun 2005 11:09:27 +0000
Subject: [PATCH] Bug 295854 (new InstallVersion()).compareTo(/x/) crashes
 [@ConvertJSValToObj] Marking JSCLASS_PRIVATE_IS_NSISUPPORTS on
 InstallVersionClass remove extra definitions of ConvertJSValToObj to prevent
 confusion r=dveditz sr=dveditz a=dveditz

git-svn-id: svn://10.0.0.236/trunk@174697 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/xpinstall/src/nsJSFile.cpp                 | 6 ------
 mozilla/xpinstall/src/nsJSFileSpecObj.cpp          | 6 ------
 mozilla/xpinstall/src/nsJSInstallTriggerGlobal.cpp | 6 ------
 mozilla/xpinstall/src/nsJSInstallVersion.cpp       | 2 +-
 mozilla/xpinstall/src/nsJSWinProfile.cpp           | 6 ------
 mozilla/xpinstall/src/nsJSWinReg.cpp               | 6 ------
 6 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/mozilla/xpinstall/src/nsJSFile.cpp b/mozilla/xpinstall/src/nsJSFile.cpp
index 402838978f8..b120980f485 100644
--- a/mozilla/xpinstall/src/nsJSFile.cpp
+++ b/mozilla/xpinstall/src/nsJSFile.cpp
@@ -71,12 +71,6 @@ extern PRBool ConvertJSValToBool(PRBool* aProp,
                                 JSContext* aContext,
                                 jsval aValue);
 
-extern PRBool ConvertJSValToObj(nsISupports** aSupports,
-                               REFNSIID aIID,
-                               const nsString& aTypeName,
-                               JSContext* aContext,
-                               jsval aValue);
-
 extern JSObject *gFileSpecProto;
 extern JSClass InstallClass;
 
diff --git a/mozilla/xpinstall/src/nsJSFileSpecObj.cpp b/mozilla/xpinstall/src/nsJSFileSpecObj.cpp
index a7ff6569d2a..e52b551b17c 100644
--- a/mozilla/xpinstall/src/nsJSFileSpecObj.cpp
+++ b/mozilla/xpinstall/src/nsJSFileSpecObj.cpp
@@ -56,12 +56,6 @@ extern PRBool ConvertJSValToBool(PRBool* aProp,
                                 JSContext* aContext,
                                 jsval aValue);
 
-extern PRBool ConvertJSValToObj(nsISupports** aSupports,
-                               REFNSIID aIID,
-                               const nsString& aTypeName,
-                               JSContext* aContext,
-                               jsval aValue);
-
 
 
 static void PR_CALLBACK
diff --git a/mozilla/xpinstall/src/nsJSInstallTriggerGlobal.cpp b/mozilla/xpinstall/src/nsJSInstallTriggerGlobal.cpp
index 14eaf7349ab..49ae9a8fa67 100644
--- a/mozilla/xpinstall/src/nsJSInstallTriggerGlobal.cpp
+++ b/mozilla/xpinstall/src/nsJSInstallTriggerGlobal.cpp
@@ -70,12 +70,6 @@ extern PRBool ConvertJSValToBool(PRBool* aProp,
                                 JSContext* aContext,
                                 jsval aValue);
 
-extern PRBool ConvertJSValToObj(nsISupports** aSupports,
-                               REFNSIID aIID,
-                               const nsString& aTypeName,
-                               JSContext* aContext,
-                               jsval aValue);
-
 PR_STATIC_CALLBACK(void)
 FinalizeInstallTriggerGlobal(JSContext *cx, JSObject *obj);
 
diff --git a/mozilla/xpinstall/src/nsJSInstallVersion.cpp b/mozilla/xpinstall/src/nsJSInstallVersion.cpp
index ac77526ddab..54293855d02 100644
--- a/mozilla/xpinstall/src/nsJSInstallVersion.cpp
+++ b/mozilla/xpinstall/src/nsJSInstallVersion.cpp
@@ -71,7 +71,7 @@ FinalizeInstallVersion(JSContext *cx, JSObject *obj);
 //
 JSClass InstallVersionClass = {
   "InstallVersion",
-  JSCLASS_HAS_PRIVATE,
+  JSCLASS_HAS_PRIVATE | JSCLASS_PRIVATE_IS_NSISUPPORTS,
   JS_PropertyStub,
   JS_PropertyStub,
   GetInstallVersionProperty,
diff --git a/mozilla/xpinstall/src/nsJSWinProfile.cpp b/mozilla/xpinstall/src/nsJSWinProfile.cpp
index ea01b887cf5..d2023dc6d73 100644
--- a/mozilla/xpinstall/src/nsJSWinProfile.cpp
+++ b/mozilla/xpinstall/src/nsJSWinProfile.cpp
@@ -56,12 +56,6 @@ extern PRBool ConvertJSValToBool(PRBool* aProp,
                                 JSContext* aContext,
                                 jsval aValue);
 
-extern PRBool ConvertJSValToObj(nsISupports** aSupports,
-                               REFNSIID aIID,
-                               const nsString& aTypeName,
-                               JSContext* aContext,
-                               jsval aValue);
-
 
 static void PR_CALLBACK
 WinProfileCleanup(JSContext *cx, JSObject *obj);
diff --git a/mozilla/xpinstall/src/nsJSWinReg.cpp b/mozilla/xpinstall/src/nsJSWinReg.cpp
index 5d093c83987..962e624f72d 100644
--- a/mozilla/xpinstall/src/nsJSWinReg.cpp
+++ b/mozilla/xpinstall/src/nsJSWinReg.cpp
@@ -58,12 +58,6 @@ extern PRBool ConvertJSValToBool(PRBool* aProp,
                                 JSContext* aContext,
                                 jsval aValue);
 
-extern PRBool ConvertJSValToObj(nsISupports** aSupports,
-                               REFNSIID aIID,
-                               const nsString& aTypeName,
-                               JSContext* aContext,
-                               jsval aValue);
-
 
 static void PR_CALLBACK WinRegCleanup(JSContext *cx, JSObject *obj)
 {