From eb160fd83fe725e9caf122de58d5d990f8ff14a7 Mon Sep 17 00:00:00 2001
From: "bryner%uiuc.edu" <bryner%uiuc.edu>
Date: Fri, 29 Dec 2000 03:46:29 +0000
Subject: [PATCH] Eliminating mailnews dependencies on merrors.h and msgcom.h. 
 Part of bug 38061.  r=sspitzer, sr=scc.

---
 mailnews/compose/src/nsMsgCompFields.h | 14 +++++++++++++-
 mailnews/news/src/nntpCore.h           |  3 +++
 mailnews/news/src/nsNNTPProtocol.cpp   |  1 -
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/mailnews/compose/src/nsMsgCompFields.h b/mailnews/compose/src/nsMsgCompFields.h
index a381c9b6b8a..fd050f2e8bc 100644
--- a/mailnews/compose/src/nsMsgCompFields.h
+++ b/mailnews/compose/src/nsMsgCompFields.h
@@ -29,7 +29,19 @@
 #include "nsIMsgCompFields.h"
 #include "nsMsgZapIt.h"
 #include "xp_core.h"
-#include "msgcom.h"
+
+typedef uint32 MSG_HEADER_SET;
+typedef enum {
+        MSG_RETURN_RECEIPT_BOOL_HEADER_MASK = 0,
+        MSG_ENCRYPTED_BOOL_HEADER_MASK,
+        MSG_SIGNED_BOOL_HEADER_MASK,
+        MSG_UUENCODE_BINARY_BOOL_HEADER_MASK,
+        MSG_ATTACH_VCARD_BOOL_HEADER_MASK,
+        MSG_LAST_BOOL_HEADER_MASK            /* last boolean header mask; must be the last one
+                                              * DON'T remove.
+                                              */
+} MSG_BOOL_HEADER_SET;
+
 
 /* Note that all the "Get" methods never return NULL (except in case of serious
    error, like an illegal parameter); rather, they return "" if things were set
diff --git a/mailnews/news/src/nntpCore.h b/mailnews/news/src/nntpCore.h
index 3fb9252f8cb..a59b5fa3a4a 100644
--- a/mailnews/news/src/nntpCore.h
+++ b/mailnews/news/src/nntpCore.h
@@ -139,6 +139,9 @@
 // the following used to be defined in allxpstr.h. Until we find a new values for these, 
 // I'm defining them here because I don't want to link against xplib.lib...(mscott)
 
+#define MK_DATA_LOADED		1
+#define MK_EMPTY_NEWS_LIST	-227
+#define MK_INTERRUPTED		-201
 #define MK_MALFORMED_URL_ERROR	-209
 #define MK_NEWS_ERROR_FMT		-430
 #define MK_NNTP_CANCEL_CONFIRM	-426
diff --git a/mailnews/news/src/nsNNTPProtocol.cpp b/mailnews/news/src/nsNNTPProtocol.cpp
index bf99a13d0b5..ebd7c1d043d 100644
--- a/mailnews/news/src/nsNNTPProtocol.cpp
+++ b/mailnews/news/src/nsNNTPProtocol.cpp
@@ -53,7 +53,6 @@
 #include "nsEscape.h"
 
 #include "prprf.h"
-#include "merrors.h"
 
 /* include event sink interfaces for news */