X-Git-Url: http://git.openafs.org/?p=openafs.git;a=blobdiff_plain;f=src%2Fafs%2FUKERNEL%2Fsysincludes.h;h=15000652fab081014adbdf219b5bbb78d7304ae9;hp=e21a5a4ddb910b05b8b34755a6b2d5aa6bf484df;hb=6534b10a4180ec10bceebbc11405718e7969fa21;hpb=8ad4e15ffc883c9a99f9636d7d8a5ed0a2fcc26a

diff --git a/src/afs/UKERNEL/sysincludes.h b/src/afs/UKERNEL/sysincludes.h
index e21a5a4..1500065 100644
--- a/src/afs/UKERNEL/sysincludes.h
+++ b/src/afs/UKERNEL/sysincludes.h
@@ -82,23 +82,6 @@
 #include  <arpa/inet.h>
 #endif /* AFS_USR_HPUX_ENV */
 
-#ifdef AFS_USR_OSF_ENV
-#ifdef KERNEL
-#undef KERNEL
-#define AFS_USR_UNDEF_KERNEL_ENV 1
-#endif
-#include  <sys/param.h>
-#include  <sys/socket.h>
-#include  <net/if.h>
-#include  <sys/file.h>
-#include  <sys/ioctl.h>
-#include  <sys/stat.h>
-#include  <sys/fcntl.h>
-#include  <netinet/in.h>
-#include  <netdb.h>
-#include  <arpa/inet.h>
-#endif /* AFS_USR_OSF_ENV */
-
 #ifdef AFS_USR_LINUX22_ENV
 #include  <sys/ioctl.h>		/* _IOW() */
 #include  <sys/uio.h>		/* struct iovec */
@@ -256,11 +239,7 @@ typedef unsigned int fsblkcnt_t;
 
 enum usr_vcexcl { usr_NONEXCL, usr_EXCL };
 typedef long offset_t;
-#ifdef AFS_USR_OSF_ENV
-typedef int usr_ino_t;
-#else /* AFS_USR_OSF_ENV */
 typedef long usr_ino_t;
-#endif /* AFS_USR_OSF_ENV */
 
 #if defined(AFS_USR_AIX_ENV) || defined(AFS_USR_SGI_ENV)
 #define SYS_setgroups		101
@@ -1242,11 +1221,7 @@ extern struct usr_in_ifaddr *usr_in_ifaddr;
 #endif /* UKERNEL */
 
 struct min_direct {
-#if defined(AFS_USR_OSF_ENV)
-    unsigned int d_fileno;
-#else				/* AFS_OFS_ENV || AFS_USR_OSF_ENV */
     unsigned long d_fileno;
-#endif				/* AFS_OFS_ENV || AFS_USR_OSF_ENV */
     unsigned short d_reclen;
     unsigned short d_namlen;
 };