From 9f2fefb6067bd48cf9d1cc1ed9747cf6e89662c4 Mon Sep 17 00:00:00 2001
From: "warren%netscape.com"
 <warren%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 29 Aug 1998 02:21:49 +0000
Subject: [PATCH] Moved nsresult from nsISupports.h to nsError.h (so that it's
 defined for C files).

git-svn-id: svn://10.0.0.236/trunk@8782 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/xpcom/src/nsError.h     | 8 ++++++++
 mozilla/xpcom/src/nsISupports.h | 6 ------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/mozilla/xpcom/src/nsError.h b/mozilla/xpcom/src/nsError.h
index 75571ad3cea..db53d745ed1 100644
--- a/mozilla/xpcom/src/nsError.h
+++ b/mozilla/xpcom/src/nsError.h
@@ -19,6 +19,12 @@
 #ifndef nsError_h
 #define nsError_h
 
+/**
+ * Generic result data type
+ */
+
+typedef PRUint32 nsresult;
+
 /*
  * To add error code to your module, you need to do the following:
  *
@@ -47,6 +53,8 @@
 #define NS_ERROR_MODULE_GFX       3
 #define NS_ERROR_MODULE_WIDGET    4
 #define NS_ERROR_MODULE_CALENDAR  5
+#define NS_ERROR_MODULE_NETWORK   6
+#define NS_ERROR_MODULE_PLUGINS   7
 
 /**
  * @name Standard Error Handling Macros
diff --git a/mozilla/xpcom/src/nsISupports.h b/mozilla/xpcom/src/nsISupports.h
index 1e11e906324..dd4a6b10e68 100644
--- a/mozilla/xpcom/src/nsISupports.h
+++ b/mozilla/xpcom/src/nsISupports.h
@@ -58,12 +58,6 @@ typedef nsID nsIID;
 { 0x00000000, 0x0000, 0x0000, \
   {0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46} }
 
-/**
- * Generic result data type
- */
-
-typedef PRUint32 nsresult;
-
 /**
  * Reference count values
  */