X-Git-Url: http://git.openafs.org/?p=openafs.git;a=blobdiff_plain;f=src%2Fafs%2FSOLARIS%2Fosi_machdep.h;h=b38d1e3492e415f37c6d48c5c4a51c54bf65cea8;hp=31474452544b0f3e2798bf4d8acedecca55fd072;hb=e4c2810f;hpb=a4e3c3be697bb99ee4846c99550cd2b52929cdca

diff --git a/src/afs/SOLARIS/osi_machdep.h b/src/afs/SOLARIS/osi_machdep.h
index 3147445..b38d1e3 100644
--- a/src/afs/SOLARIS/osi_machdep.h
+++ b/src/afs/SOLARIS/osi_machdep.h
@@ -18,7 +18,7 @@
 #ifndef _OSI_MACHDEP_H_
 #define _OSI_MACHDEP_H_
 
-#ifdef AFS_SUN57_64BIT_ENV
+#ifdef AFS_SUN5_64BIT_ENV
 #include <sys/model.h>		/* for get_udatamodel() */
 #endif
 
@@ -54,8 +54,7 @@ local_osi_Time()
 #define osi_Time() (hrestime.tv_sec)
 #endif
 
-#ifdef AFS_SUN58_ENV
-# define osi_vnhold(avc, r)  do {    \
+#define osi_vnhold(avc, r)  do {    \
     struct vnode *vp = AFSTOV(avc); \
     uint_t prevcount;               \
                                     \
@@ -67,9 +66,6 @@ local_osi_Time()
 	VFS_HOLD(afs_globalVFS);    \
     }                               \
 } while(0)
-#else /* !AFS_SUN58_ENV */
-# define osi_vnhold(avc, r)  do { VN_HOLD(AFSTOV(avc)); } while(0)
-#endif /* !AFS_SUN58_ENV */
 
 #define gop_rdwr(rw,gp,base,len,offset,segflg,ioflag,ulimit,cr,aresid) \
   vn_rdwr((rw),(gp),(base),(len),(offset),(segflg),(ioflag),(ulimit),(cr),(aresid))
@@ -113,7 +109,6 @@ extern kmutex_t afs_global_lock;
 #define	IO_SYNC		FSYNC
 #endif
 
-#if	defined(AFS_SUN56_ENV)
 /*
 ** Macro returns 1 if file is larger than 2GB; else returns 0
 */
@@ -121,7 +116,6 @@ extern kmutex_t afs_global_lock;
 #define AfsLargeFileUio(uio)       ( (uio)->_uio_offset._p._u ? 1 : 0 )
 #undef AfsLargeFileSize
 #define AfsLargeFileSize(pos, off) ( ((offset_t)(pos)+(offset_t)(off) > (offset_t)0x7fffffff)?1:0)
-#endif
 
 #if defined(AFS_SUN510_ENV)
 #include "h/sunddi.h"