unix.statfs etc: Naming conflicts.

diff --git a/basis/io/files/info/unix/macosx/macosx.factor b/basis/io/files/info/unix/macosx/macosx.factor
index d066b120e11914a2281130fbbda4be074de041b3..85658c21e0242ff5870a10f649296ffc5cea0a75 100644 (file)
--- a/basis/io/files/info/unix/macosx/macosx.factor
+++ b/basis/io/files/info/unix/macosx/macosx.factor
@@ -33,10 +33,10 @@ M: macosx file-systems ( -- array )
 M: macosx new-file-system-info macosx-file-system-info new ;
 
 M: macosx file-system-statfs ( normalized-path -- statfs )
-    \ statfs64 <struct> [ statfs64 io-error ] keep ;
+    \ statfs64 <struct> [ statfs64-func io-error ] keep ;
 
 M: macosx file-system-statvfs ( normalized-path -- statvfs )
-    \ statvfs <struct> [ statvfs io-error ] keep ;
+    \ statvfs <struct> [ statvfs-func io-error ] keep ;
 
 M: macosx statfs>file-system-info ( file-system-info byte-array -- file-system-info' )
     {

diff --git a/basis/unix/statfs/macosx/macosx.factor b/basis/unix/statfs/macosx/macosx.factor
index 50bb0c2227f8add8855efc8404adb5ec89cd9ebb..cb4c925e958b2dc44ec01b7ff3c0de010e92850e 100644 (file)
--- a/basis/unix/statfs/macosx/macosx.factor
+++ b/basis/unix/statfs/macosx/macosx.factor
@@ -115,5 +115,5 @@ STRUCT: statfs64
     { f_mntfromname { char MAXPATHLEN } }
     { f_reserved uint32_t[8] } ;
 
-FUNCTION: int statfs64 ( c-string path, statfs64* buf ) ;
+FUNCTION-ALIAS: statfs64-func int statfs64 ( c-string path, statfs64* buf ) ;
 FUNCTION: int getmntinfo64 ( statfs64** mntbufp, int flags ) ;

diff --git a/basis/unix/statvfs/macosx/macosx.factor b/basis/unix/statvfs/macosx/macosx.factor
index 79c9b0e3137c74bc4ce9341d07cb4ac6b7dfddfc..c40a1db3ee7b7e568d88126342886dd357d55f52 100644 (file)
--- a/basis/unix/statvfs/macosx/macosx.factor
+++ b/basis/unix/statvfs/macosx/macosx.factor
@@ -20,4 +20,4 @@ STRUCT: statvfs
 CONSTANT: ST_RDONLY   0x1 ! Read-only file system
 CONSTANT: ST_NOSUID   0x2 ! Does not honor setuid/setgid
 
-FUNCTION: int statvfs ( c-string path, statvfs* buf ) ;
+FUNCTION-ALIAS: statvfs-func int statvfs ( c-string path, statvfs* buf ) ;