various tweaks to make this build on Linux

mailnews/mime/src/nsMimeFactory.cpp

@@ -26,6 +26,11 @@
 #include "nsINetPlugin.h"
 #include "nsIComponentManager.h"
 #include "plugin_inst.h"
+
+/* net.h includes xp_core.h which has trouble with "Bool" */
+#ifdef XP_UNIX
+#undef Bool
+#endif
 #include "net.h"
 
 static NS_DEFINE_CID(kComponentManagerCID, NS_COMPONENTMANAGER_CID);

mailnews/mime/src/oldfile.cpp

@@ -86,8 +86,10 @@ char *xpFileTypeToName(XP_FileType type) {
             break;
         case (xpHTTPCookie):
             return PL_strdup("%USER%%COOKIE_F%");
+#if defined(CookieManagement)
         case (xpHTTPCookiePermission):
             return PL_strdup("%USER%%COOKIE_PERMISSION_F%");
+#endif
      //   case (xpHTTPSingleSignon):
      //       return PL_strdup("%USER%%SIGNON_F%");
 

mailnews/mime/src/plugin_inst.cpp

@@ -21,6 +21,10 @@
 #include "plugin_inst.h"
 #include "rebuffer.h"
 
+/* net.h includes xp_core.h which has trouble with "Bool" */
+#ifdef XP_UNIX
+#undef Bool
+#endif
 #include "net.h"
 
 static NS_DEFINE_IID(kINetPluginInstanceIID,  NS_INETPLUGININSTANCE_IID);

mailnews/mime/src/plugin_inst.h

@@ -23,7 +23,7 @@
 #include "nsINetPluginInstance.h"
 
 // The ProgID for message/rfc822 messages
-#define	PROGRAM_ID	        MESSAGE_RFC822
+#define	PROGRAM_ID	        "message/rfc822"
 
 // {B21EDB21-D10C-11d2-B373-525400E2D63A}
 #define NS_INET_PLUGIN_MIME_CID          \