From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Sun, 12 Dec 2004 10:00:39 +0000 (+0000)
Subject: 10.4 header collision fix
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/9d517267024613f75f896073fcd8943ca104916e?ds=inline

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 36e7a06643..62a495361c 100644
--- 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 c73da46d94..5f5393e3c0 100644
--- 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);