From 87083c17e802394d5fe7804c6e866e3c74a95a2e Mon Sep 17 00:00:00 2001
From: "dp%netscape.com" <dp%netscape.com>
Date: Mon, 31 Jan 2000 22:57:28 +0000
Subject: [PATCH] Using NS_METHOD to satisfy windows compiler instead of
 nsresult.

---
 extensions/cookie/nsCookieHTTPNotify.cpp | 14 +++++++-------
 extensions/cookie/nsCookieHTTPNotify.h   | 14 +++++++-------
 extensions/cookie/nsCookieService.cpp    |  2 --
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/extensions/cookie/nsCookieHTTPNotify.cpp b/extensions/cookie/nsCookieHTTPNotify.cpp
index 7a1624b2138e..a5fee5d20808 100644
--- a/extensions/cookie/nsCookieHTTPNotify.cpp
+++ b/extensions/cookie/nsCookieHTTPNotify.cpp
@@ -51,10 +51,10 @@ nsresult nsCookieHTTPNotify::Create(nsISupports *aOuter, REFNSIID aIID, void **a
     return nsCookieHTTPNotifyConstructor(aOuter, aIID, aResult);
 }
 
-nsresult nsCookieHTTPNotify::RegisterProc(nsIComponentManager *aCompMgr,
-                                                   nsIFile *aPath,
-                                                   const char *registryLocation,
-                                                   const char *componentType)
+NS_METHOD nsCookieHTTPNotify::RegisterProc(nsIComponentManager *aCompMgr,
+                                           nsIFile *aPath,
+                                           const char *registryLocation,
+                                           const char *componentType)
 {
     // Register ourselves into the NS_CATEGORY_HTTP_STARTUP
     nsresult rv;
@@ -72,9 +72,9 @@ nsresult nsCookieHTTPNotify::RegisterProc(nsIComponentManager *aCompMgr,
 
 }
 
-nsresult nsCookieHTTPNotify::UnregisterProc(nsIComponentManager *aCompMgr,
-                                                     nsIFile *aPath,
-                                                     const char *registryLocation)
+NS_METHOD nsCookieHTTPNotify::UnregisterProc(nsIComponentManager *aCompMgr,
+                                             nsIFile *aPath,
+                                             const char *registryLocation)
 {
     nsresult rv;
     nsCOMPtr<nsICategoryManager> catman = do_GetService("mozilla.categorymanager.1", &rv);
diff --git a/extensions/cookie/nsCookieHTTPNotify.h b/extensions/cookie/nsCookieHTTPNotify.h
index 5319bf1e8e45..9683fcccdc4b 100644
--- a/extensions/cookie/nsCookieHTTPNotify.h
+++ b/extensions/cookie/nsCookieHTTPNotify.h
@@ -53,13 +53,13 @@ public:
   virtual ~nsCookieHTTPNotify();
 
   static nsresult Create(nsISupports *aOuter, REFNSIID aIID, void **aResult);
-  static nsresult RegisterProc(nsIComponentManager *aCompMgr,
-                               nsIFile *aPath,
-                               const char *registryLocation,
-                               const char *componentType);
-  static nsresult UnregisterProc(nsIComponentManager *aCompMgr,
-                                 nsIFile *aPath,
-                                 const char *registryLocation);
+  static NS_METHOD RegisterProc(nsIComponentManager *aCompMgr,
+                                nsIFile *aPath,
+                                const char *registryLocation,
+                                const char *componentType);
+  static NS_METHOD UnregisterProc(nsIComponentManager *aCompMgr,
+                                  nsIFile *aPath,
+                                  const char *registryLocation);
 
 private:
     nsCOMPtr<nsIAtom> mCookieHeader;
diff --git a/extensions/cookie/nsCookieService.cpp b/extensions/cookie/nsCookieService.cpp
index 6a223b08da8c..edebc770632d 100644
--- a/extensions/cookie/nsCookieService.cpp
+++ b/extensions/cookie/nsCookieService.cpp
@@ -181,10 +181,8 @@ static nsModuleComponentInfo components[] = {
       NS_COOKIEHTTPNOTIFY_CID,
       NS_COOKIEHTTPNOTIFY_PROGID,
       nsCookieHTTPNotifyConstructor,
-#if 0
       nsCookieHTTPNotify::RegisterProc,
       nsCookieHTTPNotify::UnregisterProc
-#endif
     },
 };