10.4 header collision fix

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30941 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/morefilex/MoreFilesX.c b/src/mac/carbon/morefilex/MoreFilesX.c
index 36e7a06643dbd911588898244c13a687764aa071..62a495361c9db268b82b26e1f8086d83cebd129b 100644 (file)
--- a/src/mac/carbon/morefilex/MoreFilesX.c
+++ b/src/mac/carbon/morefilex/MoreFilesX.c
@@ -2122,7 +2122,7 @@ BadParameter:
 /*****************************************************************************/
 
 OSErr
-FSLockRange(
+FSLockRangeMoreFilesX(
        SInt16 refNum,
        SInt32 rangeLength,
        SInt32 rangeStart)
@@ -2145,7 +2145,7 @@ PBLockRangeSync:
 /*****************************************************************************/
 
 OSErr
-FSUnlockRange(
+FSUnlockRangeMoreFilesX(
        SInt16 refNum,
        SInt32 rangeLength,
        SInt32 rangeStart)
@@ -2610,7 +2610,7 @@ BadParameter:
 
 /*****************************************************************************/
 
-static Ptr
+Ptr
 GetTempBuffer(
        ByteCount buffReqSize,
        ByteCount *buffActSize)

diff --git a/src/mac/carbon/morefilex/MoreFilesX.h b/src/mac/carbon/morefilex/MoreFilesX.h
index c73da46d94a7f4ad2c6bc212260f0ee2ab95173c..5f5393e3c09203378e28ed489a69af808c41e76a 100644 (file)
--- a/src/mac/carbon/morefilex/MoreFilesX.h
+++ b/src/mac/carbon/morefilex/MoreFilesX.h
@@ -1335,7 +1335,7 @@ FSExchangeObjectsCompat(
 #pragma mark FSLockRange
 
 OSErr
-FSLockRange(
+FSLockRangeMoreFilesX(
        SInt16 refNum,
        SInt32 rangeLength,
        SInt32 rangeStart);
@@ -1358,7 +1358,7 @@ FSLockRange(
 #pragma mark FSUnlockRange
 
 OSErr
-FSUnlockRange(
+FSUnlockRangeMoreFilesX(
        SInt16 refNum,
        SInt32 rangeLength,
        SInt32 rangeStart);