Changeset 589 in vbox for trunk/src/libs/xpcom18a4/xpcom/MoreFiles

Timestamp:

Feb 4, 2007 12:25:57 PM (18 years ago)

Author:

vboxsync

Message:

Make it build and run on Mac OS X.

Location:

trunk/src/libs/xpcom18a4/xpcom/MoreFiles

Files:

• FSCopyObject.c (modified) (1 diff)
• FSCopyObject.h (modified) (1 diff)
• MoreFilesX.c (modified) (5 diffs)
• MoreFilesX.h (modified) (4 diffs)

trunk/src/libs/xpcom18a4/xpcom/MoreFiles/FSCopyObject.c

@@ -44 +44 @@
         Copyright © 2002 Apple Computer, Inc., All Rights Reserved
 */
+
+// Modified 2006-01-23 - added this comment.
 
 #include "FSCopyObject.h"

trunk/src/libs/xpcom18a4/xpcom/MoreFiles/FSCopyObject.h

@@ -42 +42 @@
 */
 
+// Modified 2006-01-23 - added this comment.
 
 #ifndef __FSCOPYOBJECT_H__

trunk/src/libs/xpcom18a4/xpcom/MoreFiles/MoreFilesX.c

@@ -69 +69 @@
                  <1>     1/25/02        JL              MoreFilesX 1.0
 */
+
+// Modified 2006-01-23 - added this comment.
 
 #if defined(__MACH__)
@@ -2125 +2127 @@
 /*****************************************************************************/
 
-OSErr
-FSLockRange(
+/* Renamed from FSLockRange to MFX_FSLockRange to avoid a conflict with
+ * the FSLockRange function present in the system library since Mac OS X
+ * 10.4. */
+
+OSErr
+MFX_FSLockRange(
         SInt16 refNum,
         SInt32 rangeLength,
@@ -2148 +2154 @@
 /*****************************************************************************/
 
-OSErr
-FSUnlockRange(
+/* Renamed from FSUnlockRange to MFX_FSUnlockRange to avoid a conflict with
+ * the FSUnlockRange function present in the system library since Mac OS X
+ * 10.4. */
+
+OSErr
+MFX_FSUnlockRange(
         SInt16 refNum,
         SInt32 rangeLength,
@@ -2307 +2317 @@
 /*****************************************************************************/
 
+// 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(
@@ -2330 +2343 @@
         return ( result );
 }
+#endif
 
 /*****************************************************************************/

trunk/src/libs/xpcom18a4/xpcom/MoreFiles/MoreFilesX.h

@@ -84 +84 @@
                                 do less work.
 */
+
+// Modified 2006-01-23 - added this comment.
 
 #ifndef __MOREFILESX__
@@ -1333 +1335 @@
 /*****************************************************************************/
 
-#pragma mark FSLockRange
-
-OSErr
-FSLockRange(
+#pragma mark MFX_FSLockRange
+/* Renamed from FSLockRange to MFX_FSLockRange to avoid a conflict with
+ * the FSLockRange function present in the system library since Mac OS X
+ * 10.4. */
+
+OSErr
+MFX_FSLockRange(
         SInt16 refNum,
         SInt32 rangeLength,
@@ -1356 +1361 @@
 /*****************************************************************************/
 
-#pragma mark FSUnlockRange
-
-OSErr
-FSUnlockRange(
+#pragma mark MFX_FSUnlockRange
+/* Renamed from FSUnlockRange to MFX_FSUnlockRange to avoid a conflict with
+ * the FSUnlockRange function present in the system library since Mac OS X
+ * 10.4. */
+
+OSErr
+MFX_FSUnlockRange(
         SInt16 refNum,
         SInt32 rangeLength,
@@ -1483 +1491 @@
 #pragma mark FSVolumeMount
 
+// 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(
         const void *volMountInfo,
         FSVolumeRefNum *volRefNum);
+#endif
 
 /*