Checking in patch from bug 146310 for libxpical and RDF fixes. This should fix those two things for Mac OS 9.

calendar/libxpical/oeICalEventImpl.cpp

@@ -37,8 +37,12 @@
  * ***** END LICENSE BLOCK ***** */
 
 #ifndef WIN32
+#ifdef XP_MAC
+#include <stdlib.h> // for atol
+#else
 #include <unistd.h>
 #endif
+#endif
 
 #include "oeICalEventImpl.h"
 #include "nsMemory.h"
@@ -46,6 +50,8 @@
 #include "plbase64.h"
 #include "nsMsgCompCID.h"
 #include "nsAbBaseCID.h"
+#include "nsIAbCard.h"
+#include "nsIMsgAttachment.h"
 
 #define strcasecmp strcmp
 
@@ -2427,7 +2433,7 @@ icalcomponent* oeICalEventImpl::AsIcalComponent()
 }
 
 /********************************************************************************************/
-#include <nsIServiceManager.h>
+#include "nsIServiceManager.h"
  
 NS_IMPL_ADDREF(oeICalEventDisplayImpl)
 NS_IMPL_RELEASE(oeICalEventDisplayImpl)

calendar/libxpical/oeIICal.idl

@@ -37,9 +37,10 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "nsISupports.idl"
-#include "nsIMsgAttachment.idl"
-#include "nsIAbCard.idl"
 #include "nsISupportsArray.idl"
+
+interface nsIAbCard;
+interface nsIMsgAttachment;
 interface nsISimpleEnumerator;
 
 /**

calendar/resources/content/jslib/rdf/rdfFile.js

@@ -57,14 +57,6 @@ RDFFile.prototype._file_init = function (aPath, aFlags, aNameSpace, aID) {
      aID = "JSLIB";
   }
 
-  var filename = aPath;
-
-  if(filename.substr(0,7) == "file://") {
-     var fu = new FileUtils();
-     filename = fu.urltoPath(filename);
-  }
-
-  dump("file: "+filename+"\n");
   // Ensure we have a base RDF file to work with
   var rdf_file = new File(aPath);
 
@@ -91,7 +83,13 @@ RDFFile.prototype._file_init = function (aPath, aFlags, aNameSpace, aID) {
   rdf_file.close();
 
   // Get a reference to the available datasources
-  this._rdf_init("file://"+filename, aFlags);
+  var serv = Components.classes["@mozilla.org/network/io-service;1"].
+             getService(Components.interfaces.nsIIOService);
+  if (!serv) {
+      throw Components.results.ERR_FAILURE;
+  }
+  var uri = serv.newFileURI(rdf_file.nsIFile);
+  this._rdf_init(uri.spec, aFlags);
 };
 
 jslib_debug('*** load: '+JS_RDFFILE_FILE+' OK');