linux-rxk-header-update-20041217

[openafs.git] / src / rx / rx_kcommon.h

diff --git a/src/rx/rx_kcommon.h b/src/rx/rx_kcommon.h
index d50ba41..30b4908 100644 (file)
--- a/src/rx/rx_kcommon.h
+++ b/src/rx/rx_kcommon.h
@@ -11,99 +11,138 @@
  * rx_kcommon.h - Common kernel RX header for all system types.
  */
 
+#ifdef UKERNEL
+#include <UKERNEL/rx_kcommon.h>
+#else
+
 #ifndef _RX_KCOMMON_H_
 #define _RX_KCOMMON_H_
 
+#ifdef AFS_LINUX22_ENV
+#ifndef _LINUX_CODA_FS_I
+#define _LINUX_CODA_FS_I 1
+#endif
+#define _CODA_HEADER_ 1
+struct coda_inode_info {
+};
+#endif
 #ifdef AFS_DARWIN_ENV
 #ifndef _MACH_ETAP_H_
 #define _MACH_ETAP_H_
-typedef unsigned short                  etap_event_t;
+typedef unsigned short etap_event_t;
+#endif
 #endif
-#endif  
-#include "../h/types.h"
-#include "../h/param.h"
+
+
+#include "h/types.h"
+#include "h/param.h"
 #ifndef AFS_LINUX22_ENV
-#include "../h/systm.h"
+#include "h/systm.h"
 #endif
-#include "../h/time.h"
+#include "h/time.h"
 #ifdef AFS_SUN56_ENV
-#include "../h/vfs.h"          /* stops SUN56 socketvar.h warnings */
-#include "../h/stropts.h"      /* stops SUN56 socketvar.h warnings */
-#include "../h/stream.h"       /* stops SUN56 socketvar.h errors */
-#include "../h/disp.h"
+#include "h/vfs.h"             /* stops SUN56 socketvar.h warnings */
+#include "h/stropts.h"         /* stops SUN56 socketvar.h warnings */
+#include "h/stream.h"          /* stops SUN56 socketvar.h errors */
+#include "h/disp.h"
 #endif
-#include "../h/socket.h"
-#ifndef AFS_LINUX22_ENV
-#include "../h/socketvar.h"
-#include "../h/protosw.h"
+#include "h/socket.h"
+#if !defined(AFS_LINUX22_ENV) && !defined(AFS_OBSD_ENV)
+#include "h/socketvar.h"
 #if !defined(AFS_SUN5_ENV) && !defined(AFS_XBSD_ENV)
-#include "../h/domain.h"
-#include "../h/dir.h"
-#include "../h/buf.h"
-#include "../h/mbuf.h"
-#else
-#if defined(AFS_XBSD_ENV)
-#include "../h/dirent.h"
-#include "../h/socket.h"
-#include "../h/domain.h"
-#include "../h/buf.h"
-#include "../h/mbuf.h"
-#endif /* AFS_XBSD_ENV */
+#include "h/domain.h"
+#if !defined(AFS_HPUX110_ENV)
+#include "h/dir.h"
 #endif
-#endif /* AFS_LINUX22_ENV */
+#include "h/buf.h"
+#if !defined(AFS_HPUX110_ENV)
+#include "h/mbuf.h"
+#endif
+#else /* !defined(AFS_SUN5_ENV) && !defined(AFS_XBSD_ENV) */
+#if defined(AFS_FBSD_ENV)
+#include "h/dirent.h"
+#include "h/socket.h"
+#include "h/domain.h"
+#if defined(AFS_FBSD50_ENV)
+#include "h/bio.h"
+#endif
+#include "h/buf.h"
+#include "h/mbuf.h"
+#endif /* AFS_FBSD_ENV */
+#endif /* !defined(AFS_SUN5_ENV) && !defined(AFS_XBSD_ENV) */
+#endif /* !defined(AFS_LINUX22_ENV) && !defined(AFS_OBSD_ENV) */
 #ifdef AFS_SGI62_ENV
-#include "../h/hashing.h"
+#include "h/hashing.h"
 #endif
 #ifdef AFS_FBSD_ENV
-#include "../h/sysctl.h"
+#include "h/sysctl.h"
 #endif
-#include "../netinet/in.h"
-#include "../net/route.h"
-#include "../netinet/in_systm.h"
-#include "../netinet/ip.h"
-#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX22_ENV) && !defined(AFS_DARWIN60_ENV)
-#include "../netinet/in_pcb.h"
+#ifdef AFS_OBSD_ENV
+#include "h/socket.h"
+#include "h/domain.h"
+#include "h/buf.h"
+#include "net/if.h"
+#include "h/signalvar.h"
+#endif /* AFS_OBSD_ENV */
+#include "netinet/in.h"
+#ifdef AFS_LINUX22_ENV
+#include "linux/route.h"
+#else
+#include "net/route.h"
+#endif
+#if defined(HAVE_IN_SYSTM_H) || !defined(AFS_LINUX22_ENV)
+#include "netinet/in_systm.h"
+#endif
+#include "netinet/ip.h"
+#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX22_ENV) && !defined(AFS_DARWIN60_ENV) && !defined(AFS_OBSD_ENV)
+#include "netinet/in_pcb.h"
 #endif /* ! AFS_HPUX110_ENV && ! AFS_LINUX22_ENV */
 #ifndef AFS_LINUX22_ENV
 #if !defined(AFS_DARWIN60_ENV)
-#include "../netinet/ip_var.h"
+#include "netinet/ip_var.h"
 #endif
-#include "../netinet/ip_icmp.h"
+#include "netinet/ip_icmp.h"
 #endif /* AFS_LINUX22_ENV */
-#include "../netinet/udp.h"
+#include "netinet/udp.h"
 #if !defined(AFS_SGI62_ENV) && !defined(AFS_LINUX22_ENV) && !defined(AFS_DARWIN60_ENV)
-#include "../netinet/udp_var.h"
+#include "netinet/udp_var.h"
 #endif
 #if defined(AFS_HPUX102_ENV) || (defined(AFS_SGI62_ENV) && !defined(AFS_SGI64_ENV))
-#include "../h/user.h"
+#include "h/user.h"
 #endif
 #ifdef AFS_LINUX22_ENV
-#define _LINUX_CODA_FS_I
-struct coda_inode_info {};
-#include "../h/sched.h"
-#include "../h/netdevice.h"
+#include "h/sched.h"
+#include "h/netdevice.h"
+#include "linux/if.h"
 #else
-#include "../h/proc.h"
-#include "../h/file.h"
+#if !defined(AFS_OBSD_ENV)
+#include "h/proc.h"
+#include "h/file.h"
+#endif
+#include "net/if.h"
 #endif
-#include "../net/if.h"
 #if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX22_ENV) && !defined(AFS_DARWIN60_ENV)
-#include "../netinet/in_var.h"
+#include "netinet/in_var.h"
 #endif /* ! AFS_HPUX110_ENV && ! AFS_LINUX22_ENV */
-#ifndef AFS_LINUX22_ENV
-#include "../rpc/types.h"
-#endif
-#include "../afs/afs_osi.h"
-#include "../rx/rx_kmutex.h"
-#include "../afs/lock.h"
-#include "../rx/xdr.h"
-#include "../rx/rx.h"
-#include "../rx/rx_globals.h"
-#include "../afs/longc_procs.h"
-#include "../afs/afs_stats.h"
-#include "../h/errno.h"
+#if !defined(AFS_LINUX22_ENV) && !defined(AFS_DUX40_ENV)
+#include "rpc/types.h"
+#endif
+#include "afs/afs_osi.h"
+#include "rx_kmutex.h"
+#include "afs/lock.h"
+#include "rx/xdr.h"
+#include "rx/rx.h"
+#include "rx/rx_globals.h"
+#include "afs/longc_procs.h"
+#include "afs/afs_stats.h"
+#include "h/errno.h"
 #ifdef KERNEL
-#include "../afs/afsincludes.h"
+#include "afs/sysincludes.h"
+#include "afsincludes.h"
+#endif
+#if defined(AFS_OBSD_ENV)
+#include "afs/sysincludes.h"
+#include "netinet/in_pcb.h"
 #endif
 
 #define        MAXRXPORTS  20
@@ -117,3 +156,5 @@ extern struct domain inetdomain;
 #endif /* AFS_XBSD_ENV */
 
 #endif /* _RX_KCOMMON_H_ */
+
+#endif