From c7d8f02860017d383a5d2bcbedfa82affb3d8f9f Mon Sep 17 00:00:00 2001 From: "pinkerton%netscape.com" Date: Wed, 12 May 1999 02:30:50 +0000 Subject: [PATCH] more stuff that doesn't exist under Carbon, commented out when building for that. We really need a carbonated moreFiles. git-svn-id: svn://10.0.0.236/trunk@31206 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/lib/mac/MoreFiles/MoreFilesExtras.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/mozilla/lib/mac/MoreFiles/MoreFilesExtras.c b/mozilla/lib/mac/MoreFiles/MoreFilesExtras.c index ce98f28f861..523991c27f7 100644 --- a/mozilla/lib/mac/MoreFiles/MoreFilesExtras.c +++ b/mozilla/lib/mac/MoreFiles/MoreFilesExtras.c @@ -292,6 +292,8 @@ pascal OSErr HGetVInfo(short volReference, /* Find the volume's VCB */ vcbFound = false; +#if !TARGET_CARBON +// pinkerton - GetVCBQHdr does not exist under Carbon. Not sure the best way to fix this theVCB = (VCB *)(GetVCBQHdr()->qHead); while ( (theVCB != NULL) && !vcbFound ) { @@ -310,7 +312,9 @@ pascal OSErr HGetVInfo(short volReference, theVCB = (VCB *)(theVCB->qLink); } } - +#else + theVCB = NULL; +#endif if ( theVCB != NULL ) { /* Found a VCB we can use. Get the un-pinned number of allocation blocks */ @@ -346,9 +350,13 @@ pascal OSErr HGetVInfo(short volReference, ** Non-CFM 68K programs don't needs this glue (and won't get it) because ** they instead use the inline assembly glue found in the Files.h interface ** file. +** +** NSCP - pinkerton +** This code does not work under Carbon since NGetTrapAddress is not supported +** Luckily, i don't think we use this routine at all. */ -#if GENERATINGCFM +#if GENERATINGCFM && !TARGET_CARBON pascal OSErr PBXGetVolInfoSync(XVolumeParamPtr paramBlock) { enum @@ -362,7 +370,7 @@ pascal OSErr PBXGetVolInfoSync(XVolumeParamPtr paramBlock) | REGISTER_ROUTINE_PARAMETER(3, kRegisterA0, SIZE_CODE(sizeof(XVolumeParamPtr))) }; - return ( CallOSTrapUniversalProc(NGetTrapAddress(_FSDispatch, OSTrap), + return ( CallOSTrapUniversalProc(NGetTrapAddress(_FSDispatch, kOSTrapType), uppFSDispatchProcInfo, _FSDispatch, kXGetVolInfoSelector,