FIXES 3651
gotta wonder what crack monkey came up with this
AFS_UCRED is ucred in osi_machdep.h, and ucred is redefined to cred in osi_vfs.h
whatever
extern time_t time;
#define osi_Time() (time)
-#define AFS_UCRED ucred
+/* This gets redefined from ucred to cred in osi_vfs.h, just do it right */
+#define AFS_UCRED cred
#define osi_vnhold(avc, r) do { VN_HOLD(AFSTOV(avc)); } while(0)
flid_t osi_flid;
#endif
-#ifndef AFS_SGI_ENV
-/* I'm unsure where it's really coming from on Irix; afs_osi.h conflicts... */
struct AFS_UCRED *afs_osi_credp;
-#endif
void
osi_Init(void)