From 491189f20bfdceead0a33c26e48f15c32136f895 Mon Sep 17 00:00:00 2001
From: "rhp%netscape.com" <rhp%netscape.com>
Date: Tue, 13 Apr 1999 03:40:41 +0000
Subject: [PATCH] Changes for cleanup and removal of XP lib stuff

---
 mailnews/mime/cthandlers/calendar/makefile.win | 2 ++
 mailnews/mime/cthandlers/calendar/mimecal.cpp  | 7 ++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/mailnews/mime/cthandlers/calendar/makefile.win b/mailnews/mime/cthandlers/calendar/makefile.win
index 0f5011725680..b2492f36869a 100644
--- a/mailnews/mime/cthandlers/calendar/makefile.win
+++ b/mailnews/mime/cthandlers/calendar/makefile.win
@@ -90,12 +90,14 @@ LLIBS=										\
 			$(DIST)\lib\plc3.lib		\
 			$(DIST)\lib\xplib.lib       	\
 			$(DIST)\lib\xpcom32.lib       	\
+			$(DIST)\lib\raptorbase.lib       	\
 			$(NULL)
 
 LINCS=$(LINCS)  -I.							\
 			   -I..\..\src 			        \
 			   -I$(PUBLIC)\xpcom		    \
 			   -I$(PUBLIC)\mime				\
+			   -I$(PUBLIC)\raptor				\
 			   $(NULL)
 
 #//------------------------------------------------------------------------
diff --git a/mailnews/mime/cthandlers/calendar/mimecal.cpp b/mailnews/mime/cthandlers/calendar/mimecal.cpp
index 4a815182f081..a06e4fad89a5 100644
--- a/mailnews/mime/cthandlers/calendar/mimecal.cpp
+++ b/mailnews/mime/cthandlers/calendar/mimecal.cpp
@@ -23,6 +23,7 @@
 #include "mimexpcom.h"
 #include "mimecth.h"
 #include "mimeobj.h"
+#include "nsCRT.h"
 
 static int MimeInlineTextCalendar_parse_line (char *, PRInt32, MimeObject *);
 static int MimeInlineTextCalendar_parse_eof (MimeObject *, PRBool);
@@ -79,7 +80,7 @@ MimeInlineTextCalendarClassInitialize(MimeInlineTextCalendarClass *clazz)
 int
 mime_TranslateCalendar(char* caldata, char** html) 
 {
-  *html = XP_STRDUP("\
+  *html = nsCRT::strdup("\
 <text=\"#000000\" bgcolor=\"#FFFFFF\" link=\"#FF0000\" vlink=\"#800080\" alink=\"#0000FF\">\
 <center><table BORDER=1 BGCOLOR=\"#CCFFFF\" ><tr>\
 <td>This libmime Content Type Handler plugin for the Content-Type <b>text/calendar\
@@ -131,10 +132,10 @@ MimeInlineTextCalendar_parse_line(char *line, PRInt32 length, MimeObject *obj)
     do {
       clazz->buffermax += 512;
     } while (clazz->bufferlen + length >= clazz->buffermax);
-    clazz->buffer = (char *)XP_REALLOC(clazz->buffer, clazz->buffermax);
+    clazz->buffer = (char *)PR_Realloc(clazz->buffer, clazz->buffermax);
     if (clazz->buffer == NULL) return MK_OUT_OF_MEMORY;
   }
-  XP_MEMCPY(clazz->buffer + clazz->bufferlen, line, length);
+  nsCRT::memcpy(clazz->buffer + clazz->bufferlen, line, length);
   clazz->bufferlen += length;
   return 0;
 }