Merged changes required by Mac Pro 7 from NSPRPUB_PRE_4_2_CLIENT_BRANCH.
authorwtc%netscape.com
Sun, 10 Mar 2002 06:31:03 +0000
changeset 2288 6eb4de75018e117d4f3886e30e51902532a83a41
parent 2286 f8855fe866fa724805cf0f9f09139f181413daf4
child 2289 cca5f664057a61d1150aad29dc4247d2832dee7d
push idunknown
push userunknown
push dateunknown
Merged changes required by Mac Pro 7 from NSPRPUB_PRE_4_2_CLIENT_BRANCH.
pr/src/io/prfile.c
--- a/pr/src/io/prfile.c
+++ b/pr/src/io/prfile.c
@@ -198,28 +198,28 @@ static PRStatus PR_CALLBACK PipeSync(PRF
 {
 #if defined(XP_MAC)
 #pragma unused (fd)
 #endif
 
 	return PR_SUCCESS;
 }
 
-static PRStatus PR_CALLBACK FileInfo(PRFileDesc *fd, PRFileInfo *info)
+static PRStatus PR_CALLBACK FileGetInfo(PRFileDesc *fd, PRFileInfo *info)
 {
 	PRInt32 rv;
 
     rv = _PR_MD_GETOPENFILEINFO(fd, info);
     if (rv < 0) {
 	return PR_FAILURE;
     } else
 	return PR_SUCCESS;
 }
 
-static PRStatus PR_CALLBACK FileInfo64(PRFileDesc *fd, PRFileInfo64 *info)
+static PRStatus PR_CALLBACK FileGetInfo64(PRFileDesc *fd, PRFileInfo64 *info)
 {
 #ifdef XP_MAC
 #pragma unused( fd, info )
 #endif
     /* $$$$ NOT YET IMPLEMENTED */
 	PRInt32 rv;
 
     rv = _PR_MD_GETOPENFILEINFO64(fd, info);
@@ -271,18 +271,18 @@ static PRIOMethods _pr_fileMethods = {
     FileClose,
     FileRead,
     FileWrite,
     FileAvailable,
     FileAvailable64,
     FileSync,
     FileSeek,
     FileSeek64,
-    FileInfo,
-    FileInfo64,
+    FileGetInfo,
+    FileGetInfo64,
     (PRWritevFN)_PR_InvalidInt,		
     (PRConnectFN)_PR_InvalidStatus,		
     (PRAcceptFN)_PR_InvalidDesc,		
     (PRBindFN)_PR_InvalidStatus,		
     (PRListenFN)_PR_InvalidStatus,		
     (PRShutdownFN)_PR_InvalidStatus,	
     (PRRecvFN)_PR_InvalidInt,		
     (PRSendFN)_PR_InvalidInt,