OJI MozClassic to raptor merge

git-svn-id: svn://10.0.0.236/trunk@18465 18797224-902f-48f8-a5cc-f745e15eee43
1999-01-25 08:05:00 +00:00
parent 1174d93a4d
commit d3239a027a
126 changed files with 8119 additions and 4096 deletions
--- a/mozilla/modules/libpref/src/nsPref.cpp
+++ b/mozilla/modules/libpref/src/nsPref.cpp
@@ -583,7 +583,7 @@ nsresult nsPrefFactory::CreateInstance(nsISupports *aDelegate,
  return res;
 }

-extern "C" NS_EXPORT nsresult NSGetFactory(const nsCID &aCID, nsIFactory **aFactory)
+extern "C" NS_EXPORT nsresult NSGetFactory(const nsCID &aCID, nsISupports* serviceMgr, nsIFactory **aFactory)
 {
  if (aFactory == NULL) {
    return NS_ERROR_NULL_POINTER;