From bf3072d449112025b2a31e741352c3788f792647 Mon Sep 17 00:00:00 2001 From: "mscott%netscape.com" Date: Thu, 3 Feb 2000 02:48:43 +0000 Subject: [PATCH] Fix for possible build breakage on Mac. --- mailnews/compose/src/nsMsgAttachmentHandler.cpp | 5 ++--- mailnews/compose/src/nsMsgAttachmentHandler.h | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mailnews/compose/src/nsMsgAttachmentHandler.cpp b/mailnews/compose/src/nsMsgAttachmentHandler.cpp index 9b754063d253..a9cd05d2050f 100644 --- a/mailnews/compose/src/nsMsgAttachmentHandler.cpp +++ b/mailnews/compose/src/nsMsgAttachmentHandler.cpp @@ -555,7 +555,8 @@ nsMsgAttachmentHandler::SnarfAttachment(nsMsgCompFields *compFields) char *separator; nsInputStream inputFile(nsFileSpec(url_string)); - if (!inputFile.Exists()) +#ifdef RICHIE_APPLE_DOUBLE + if (!inputFile.exists()) return NS_ERROR_OUT_OF_MEMORY; separator = mime_make_separator("ad"); @@ -579,8 +580,6 @@ nsMsgAttachmentHandler::SnarfAttachment(nsMsgCompFields *compFields) // location, then patch the new file spec into the array and send this // file instead. // -#ifdef RICHIE_APPLE_DOUBLE - AppleDoubleEncodeObject *obj = new (AppleDoubleEncodeObject); if (obj == NULL) { diff --git a/mailnews/compose/src/nsMsgAttachmentHandler.h b/mailnews/compose/src/nsMsgAttachmentHandler.h index 32521aa4a0c5..e80af75900f4 100644 --- a/mailnews/compose/src/nsMsgAttachmentHandler.h +++ b/mailnews/compose/src/nsMsgAttachmentHandler.h @@ -32,10 +32,11 @@ // Forward declarations... class nsMsgComposeAndSend; -#ifdef XP_MAC +#ifdef RICH_XP_MAC #include "nsFileStream.h" +typedef appledouble_encode_object; typedef struct _AppledoubleEncodeObject { appledouble_encode_object ap_encode_obj;