Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@239093 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
joshmoz%gmail.com
2007-11-09 19:45:34 +00:00
parent df9d510c19
commit 64c8a06e0a
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mozilla/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
mozilla/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