LINUX-5.16: Use linux/stdarg.h if available

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

diff --git a/src/rx/rx_kcommon.h b/src/rx/rx_kcommon.h
index 45bf287..8d8a330 100644 (file)
--- a/src/rx/rx_kcommon.h
+++ b/src/rx/rx_kcommon.h
@@ -1,7 +1,7 @@
 /*
  * Copyright 2000, International Business Machines Corporation and others.
  * All Rights Reserved.
- * 
+ *
  * This software has been released under the terms of the IBM Public
  * License.  For details, see the LICENSE file in the top-level source
  * directory or online at http://www.openafs.org/dl/license10.html
@@ -18,26 +18,32 @@
 #ifndef _RX_KCOMMON_H_
 #define _RX_KCOMMON_H_
 
-#ifdef AFS_DARWIN_ENV
-#ifndef _MACH_ETAP_H_
-#define _MACH_ETAP_H_
-typedef unsigned short                  etap_event_t;
+#ifdef AFS_LINUX_ENV
+#ifndef _LINUX_CODA_FS_I
+#define _LINUX_CODA_FS_I 1
+#define _CODA_HEADER_ 1
+struct coda_inode_info {
+};
 #endif
-#endif  
+#endif
+
+
 #include "h/types.h"
+#if !defined(AFS_LINUX_ENV)
 #include "h/param.h"
-#ifndef AFS_LINUX22_ENV
+#endif
+#ifndef AFS_LINUX_ENV
 #include "h/systm.h"
 #endif
 #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 */
+#ifdef AFS_SUN5_ENV
+#include "h/vfs.h"             /* stops SUN5 socketvar.h warnings */
+#include "h/stropts.h"         /* stops SUN5 socketvar.h warnings */
+#include "h/stream.h"          /* stops SUN5 socketvar.h errors */
 #include "h/disp.h"
 #endif
 #include "h/socket.h"
-#if !defined(AFS_LINUX22_ENV) && !defined(AFS_OBSD_ENV)
+#if !defined(AFS_LINUX_ENV) && !defined(AFS_OBSD_ENV)
 #include "h/socketvar.h"
 #if !defined(AFS_SUN5_ENV) && !defined(AFS_XBSD_ENV)
 #include "h/domain.h"
@@ -45,18 +51,25 @@ typedef unsigned short                  etap_event_t;
 #include "h/dir.h"
 #endif
 #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"
+#include "h/bio.h"
 #include "h/buf.h"
 #include "h/mbuf.h"
 #endif /* AFS_FBSD_ENV */
+#if defined(AFS_NBSD40_ENV)
+#include "h/buf.h"
+#include "h/mbuf.h"
+#endif
 #endif /* !defined(AFS_SUN5_ENV) && !defined(AFS_XBSD_ENV) */
-#endif /* !defined(AFS_LINUX22_ENV) && !defined(AFS_OBSD_ENV) */
-#ifdef AFS_SGI62_ENV
+#endif /* !defined(AFS_LINUX_ENV) && !defined(AFS_OBSD_ENV) */
+#ifdef AFS_SGI_ENV
 #include "h/hashing.h"
 #endif
 #ifdef AFS_FBSD_ENV
@@ -70,58 +83,77 @@ typedef unsigned short                  etap_event_t;
 #include "h/signalvar.h"
 #endif /* AFS_OBSD_ENV */
 #include "netinet/in.h"
+#ifdef AFS_LINUX_ENV
+#include "linux/route.h"
+#else
 #include "net/route.h"
+#endif
+#if defined(HAVE_IN_SYSTM_H) || !defined(AFS_LINUX_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)
+#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX_ENV) && !defined(AFS_DARWIN_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)
+#endif /* ! AFS_HPUX110_ENV && ! AFS_LINUX_ENV */
+#ifndef AFS_LINUX_ENV
+#if !defined(AFS_DARWIN_ENV)
 #include "netinet/ip_var.h"
 #endif
 #include "netinet/ip_icmp.h"
-#endif /* AFS_LINUX22_ENV */
+#endif /* AFS_LINUX_ENV */
 #include "netinet/udp.h"
-#if !defined(AFS_SGI62_ENV) && !defined(AFS_LINUX22_ENV) && !defined(AFS_DARWIN60_ENV)
+#if !defined(AFS_SGI_ENV) && !defined(AFS_LINUX_ENV) && !defined(AFS_DARWIN_ENV)
 #include "netinet/udp_var.h"
 #endif
-#if defined(AFS_HPUX102_ENV) || (defined(AFS_SGI62_ENV) && !defined(AFS_SGI64_ENV))
+#if defined(AFS_HPUX102_ENV)
 #include "h/user.h"
 #endif
-#ifdef AFS_LINUX22_ENV
-#define _LINUX_CODA_FS_I
-struct coda_inode_info {};
+#ifdef AFS_LINUX_ENV
 #include "h/sched.h"
 #include "h/netdevice.h"
+#include "linux/if.h"
 #else
 #if !defined(AFS_OBSD_ENV)
 #include "h/proc.h"
 #include "h/file.h"
 #endif
-#endif
 #include "net/if.h"
-#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 */
-#if !defined(AFS_LINUX22_ENV) && !defined(AFS_DUX40_ENV) 
-#include "rpc/types.h"
+# ifdef AFS_FBSD_ENV
+#  include <sys/socket.h>
+#  include <net/if.h>
+#  include <net/if_var.h>
+# endif
 #endif
+#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX_ENV) && !defined(AFS_DARWIN_ENV)
+#include "netinet/in_var.h"
+#endif /* ! AFS_HPUX110_ENV && ! AFS_LINUX_ENV */
 #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"
+#if !(defined(AFS_SUN5_ENV) && defined(KERNEL))
+/* if sys/systm.h includes varargs.h some versions of solaris have conflicts */
+# if defined(AFS_FBSD_ENV)
+#  include "machine/stdarg.h"
+# else
+#  if defined(HAVE_LINUX_STDARG_H)
+#   include "linux/stdarg.h"
+#  else
+#   include "stdarg.h"
+#  endif
+# endif
+#endif
 #ifdef KERNEL
 #include "afs/sysincludes.h"
 #include "afsincludes.h"
 #endif
 #if defined(AFS_OBSD_ENV)
-#include "../netinet/in_pcb.h"
+#include "afs/sysincludes.h"
+#include "netinet/in_pcb.h"
 #endif
 
 #define        MAXRXPORTS  20
@@ -134,6 +166,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