DEVEL15-death-to-longc-procs-20060804

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

diff --git a/src/rx/rx_kcommon.h b/src/rx/rx_kcommon.h
index 2545055..d9a46b9 100644 (file)
--- a/src/rx/rx_kcommon.h
+++ b/src/rx/rx_kcommon.h
@@ -19,11 +19,13 @@
 #define _RX_KCOMMON_H_
 
 #ifdef AFS_LINUX22_ENV
+#ifndef _LINUX_CODA_FS_I
 #define _LINUX_CODA_FS_I 1
 #define _CODA_HEADER_ 1
 struct coda_inode_info {
 };
 #endif
+#endif
 #ifdef AFS_DARWIN_ENV
 #ifndef _MACH_ETAP_H_
 #define _MACH_ETAP_H_
@@ -110,6 +112,9 @@ typedef unsigned short etap_event_t;
 #endif
 #ifdef AFS_LINUX22_ENV
 #include "h/sched.h"
+#if defined(FREEZER_H_EXISTS)
+#include "h/freezer.h"
+#endif
 #include "h/netdevice.h"
 #include "linux/if.h"
 #else
@@ -131,9 +136,12 @@ typedef unsigned short etap_event_t;
 #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_SUN5_ENV) && defined(KERNEL))
+/* if sys/systm.h includes varargs.h some versions of solaris have conflicts */
+#include "stdarg.h"
+#endif
 #ifdef KERNEL
 #include "afs/sysincludes.h"
 #include "afsincludes.h"
@@ -153,6 +161,10 @@ extern rxk_portRocks_t rxk_portRocks;
 extern struct domain inetdomain;
 #endif /* AFS_XBSD_ENV */
 
+#if defined(AFS_SUN510_ENV)
+extern struct afs_ifinfo afsifinfo[ADDRSPERSITE];
+#endif
+
 #endif /* _RX_KCOMMON_H_ */
 
 #endif