From aa3879c78e38238f5407320833ef4d18d2a15c51 Mon Sep 17 00:00:00 2001
From: "ducarroz%netscape.com"
 <ducarroz%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 10 Apr 1999 01:44:54 +0000
Subject: [PATCH] Mime Mac landing, last part

git-svn-id: svn://10.0.0.236/trunk@26956 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/mailnews/mime/src/oldfile.cpp | 4 +++-
 mozilla/mailnews/mime/src/oldi18n.c   | 4 ++--
 mozilla/mailnews/mime/src/oldxp.c     | 2 ++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/mozilla/mailnews/mime/src/oldfile.cpp b/mozilla/mailnews/mime/src/oldfile.cpp
index c97e27e1be5..a1c6de57d2a 100644
--- a/mozilla/mailnews/mime/src/oldfile.cpp
+++ b/mozilla/mailnews/mime/src/oldfile.cpp
@@ -22,7 +22,9 @@
 // For xp to ns file translation
 #include "nsVoidArray.h"
 #ifndef XP_UNIX
-#include "direct.h"
+	#ifndef XP_MAC
+	#include "direct.h"
+	#endif
 #endif
 
 #include "nsIComponentManager.h" 
diff --git a/mozilla/mailnews/mime/src/oldi18n.c b/mozilla/mailnews/mime/src/oldi18n.c
index 7ca7a32cb1e..b428247ce1b 100644
--- a/mozilla/mailnews/mime/src/oldi18n.c
+++ b/mozilla/mailnews/mime/src/oldi18n.c
@@ -63,7 +63,7 @@ unsigned char *INTL_ConvertLineWithoutAutoDetect(
     int16 fromcsid,
     int16 tocsid,
     unsigned char *pSrc,
-    PRUint32 block_size)
+    uint32 block_size)
 {
 	return NULL;
 }
@@ -88,7 +88,7 @@ INTL_DefaultDocCharSetID(iDocumentContext context)
 unsigned char *INTL_ConvMailToWinCharCode(
     iDocumentContext context,
     unsigned char *bit7buff,
-    PRUint32 block_size
+    uint32 block_size
 )
 {
 	return NULL;
diff --git a/mozilla/mailnews/mime/src/oldxp.c b/mozilla/mailnews/mime/src/oldxp.c
index 513649a875f..4ab17b987a7 100644
--- a/mozilla/mailnews/mime/src/oldxp.c
+++ b/mozilla/mailnews/mime/src/oldxp.c
@@ -28,7 +28,9 @@
 #endif
 
 /* RICHIE - THIS HACK MUST GO!!! - INCLUDING FILE TO TRY TO KEEP DIRECTORY CLEAN */
+#if defined(XP_WIN) || defined (XP_UNIX)
 #include "../../../lib/xp/xp_time.c"
+#endif
 
 PUBLIC void * 
 FE_SetTimeout(TimeoutCallbackFunction func, void * closure, uint32 msecs)