prototypes-fixes-20020821

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

diff --git a/src/rx/rx_kcommon.h b/src/rx/rx_kcommon.h
index c83c88f..63221e3 100644 (file)
--- a/src/rx/rx_kcommon.h
+++ b/src/rx/rx_kcommon.h
@@ -30,6 +30,7 @@ typedef unsigned short                  etap_event_t;
 #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
@@ -60,15 +61,17 @@ typedef unsigned short                  etap_event_t;
 #include "../net/route.h"
 #include "../netinet/in_systm.h"
 #include "../netinet/ip.h"
-#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX22_ENV)
+#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX22_ENV) && !defined(AFS_DARWIN60_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"
+#endif
 #include "../netinet/ip_icmp.h"
 #endif /* AFS_LINUX22_ENV */
 #include "../netinet/udp.h"
-#if !defined(AFS_SGI62_ENV) && !defined(AFS_LINUX22_ENV)
+#if !defined(AFS_SGI62_ENV) && !defined(AFS_LINUX22_ENV) && !defined(AFS_DARWIN60_ENV)
 #include "../netinet/udp_var.h"
 #endif
 #if defined(AFS_HPUX102_ENV) || (defined(AFS_SGI62_ENV) && !defined(AFS_SGI64_ENV))
@@ -84,7 +87,7 @@ struct coda_inode_info {};
 #include "../h/file.h"
 #endif
 #include "../net/if.h"
-#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX22_ENV)
+#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX22_ENV) && !defined(AFS_DARWIN60_ENV)
 #include "../netinet/in_var.h"
 #endif /* ! AFS_HPUX110_ENV && ! AFS_LINUX22_ENV */
 #ifndef AFS_LINUX22_ENV
@@ -99,23 +102,17 @@ struct coda_inode_info {};
 #include "../afs/longc_procs.h"
 #include "../afs/afs_stats.h"
 #include "../h/errno.h"
+#ifdef KERNEL
+#include "../afs/sysincludes.h"
+#include "../afs/afsincludes.h"
+#endif
 
-extern afs_int32 afs_termState;
-extern int (*rxk_GetPacketProc)(); /* set to packet allocation procedure */
-extern int (*rxk_PacketArrivalProc)();
-
-#define        MAXRXPORTS  20
+#define        MAXRXPORTS  20
 typedef unsigned short rxk_ports_t[MAXRXPORTS];
 typedef char *rxk_portRocks_t[MAXRXPORTS];
 extern rxk_ports_t rxk_ports;
 extern rxk_portRocks_t rxk_portRocks;
 
-extern struct osi_socket *rxk_NewSocket(short aport);
-extern struct ifnet *rxi_FindIfnet();
-extern int rxi_FindIfMTU();
-
-extern int rxk_initDone;
-
 #if defined(AFS_XBSD_ENV)
 extern struct domain inetdomain;
 #endif /* AFS_XBSD_ENV */