STABLE14-macos-103-20051201

last fixes i swear

(cherry picked from commit 49f0f7bb0ee04b6f80a4f84dbfd00dbf8f274ac2)

diff --git a/src/afs/DARWIN/osi_file.c b/src/afs/DARWIN/osi_file.c
index eef0f27e8db0f458175e4ce38a9075c554cca8b3..f607580d61a77c883ea544fa47a0a2282b6ccbf8 100644 (file)
--- a/src/afs/DARWIN/osi_file.c
+++ b/src/afs/DARWIN/osi_file.c
@@ -63,11 +63,7 @@ afs_InitDualFSCacheOps(struct vnode *vp)
 }
 
 ino_t
-#ifdef AFS_DARWIN80_ENV
 VnodeToIno(vnode_t avp)
-#else
-VnodeToIno(vnode_t * avp)
-#endif
 {
     unsigned long ret;
 
@@ -104,11 +100,7 @@ VnodeToIno(vnode_t * avp)
 
 
 dev_t
-#ifdef AFS_DARWIN80_ENV
 VnodeToDev(vnode_t avp)
-#else
-VnodeToDev(vnode_t * avp)
-#endif
 {
 #ifndef AFS_DARWIN80_ENV
     if (afs_CacheFSType == AFS_APPL_UFS_CACHE) {

diff --git a/src/afs/DARWIN/osi_machdep.h b/src/afs/DARWIN/osi_machdep.h
index c0bc6883710eea70afd4ba1ebf454315ec9503a5..0156e7964daceca1d796443d5d2588452134238e 100644 (file)
--- a/src/afs/DARWIN/osi_machdep.h
+++ b/src/afs/DARWIN/osi_machdep.h
@@ -203,13 +203,8 @@ extern struct lock__bsd__ afs_global_lock;
 #define AFS_APPL_UFS_CACHE 1
 #define AFS_APPL_HFS_CACHE 2
 
-#ifdef AFS_DARWIN80_ENV
 extern ino_t VnodeToIno(vnode_t avp);
-#else
-extern ino_t VnodeToIno(vnode_t * avp);
-#endif
-
-extern dev_t VnodeToDev(struct vnode * vp);
+extern dev_t VnodeToDev(vnode_t vp);
 extern int igetinode(mount_t vfsp, dev_t dev , ino_t inode, vnode_t *vpp,
               struct vattr *va, int *perror);