Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-21 02:35:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

sync trunk and branch setup for bug 400165. r=mento sr=bsmedberg a=schrep

Browse Source
This commit is contained in:
joshmoz@gmail.com 2007-11-09 11:45:34 -08:00
parent f0b08fa997
commit 007d97393b
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
xpcom/MoreFiles/MoreFilesX.c
View File

@ -2316,11 +2316,12 @@ BadParameter:
/*****************************************************************************/
// This function exists in Mac OS X 10.5, we cannot re-define it here.
// We don't use this function, so just don't compile it.
#if 0
/* Renamed from FSVolumeMount to MFX_FSVolumeMount to avoid a conflict with
* the FSVolumeMount function present in the system library since Mac OS X
* 10.5. */
OSErr
FSVolumeMount(
MFX_FSVolumeMount(
const void *volMountInfo,
FSVolumeRefNum *volRefNum)
{
@ -2342,7 +2343,6 @@ BadParameter:
return ( result );
}
#endif
/*****************************************************************************/

9
xpcom/MoreFiles/MoreFilesX.h
View File

@ -1489,15 +1489,14 @@ FSGetVolMountInfo(
/*****************************************************************************/
#pragma mark FSVolumeMount
/* Renamed from FSVolumeMount to MFX_FSVolumeMount to avoid a conflict with
* the FSVolumeMount function present in the system library since Mac OS X
* 10.5. */
// This function exists in Mac OS X 10.5, we cannot re-define it here.
// We don't use this function, so just don't compile it.
#if 0
OSErr
FSVolumeMount(
MFX_FSVolumeMount(
const void *volMountInfo,
FSVolumeRefNum *volRefNum);
#endif
/*
The VolumeMount function mounts a volume using a volume mounting