Eliminating mailnews dependencies on merrors.h and msgcom.h. Part of bug 38061. r=sspitzer, sr=scc.

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

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

mailnews/news/src/nsNNTPProtocol.cpp

@@ -53,7 +53,6 @@
 #include "nsEscape.h"
 
 #include "prprf.h"
-#include "merrors.h"
 
 /* include event sink interfaces for news */