From 24abbf148a65b11291390f503d354b22a43aa021 Mon Sep 17 00:00:00 2001 From: Jim Rees Date: Wed, 31 May 2006 17:01:45 +0000 Subject: [PATCH] STABLE14-obsd39-20060531 pull up changes for OpenBSD 3.8/3.9 to 1.4.x branch --- src/rx/rx_kernel.h | 1 + src/rx/xdr_rx.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/rx/rx_kernel.h b/src/rx/rx_kernel.h index d147e3b0a..3bb6d7d35 100644 --- a/src/rx/rx_kernel.h +++ b/src/rx/rx_kernel.h @@ -43,6 +43,7 @@ extern int osi_utoa(char *buf, size_t len, unsigned long val); #ifndef AFS_DARWIN80_ENV #define ifnet_mtu(x) (x)->if_mtu +#define ifnet_flags(x) (x?(x)->if_flags:0) #define AFS_IFNET_T struct ifnet * #else #define AFS_IFNET_T ifnet_t diff --git a/src/rx/xdr_rx.c b/src/rx/xdr_rx.c index dbeb6f5ef..fe79fbd16 100644 --- a/src/rx/xdr_rx.c +++ b/src/rx/xdr_rx.c @@ -22,6 +22,7 @@ RCSID ("$Header$"); #ifdef KERNEL +#include "afs/sysincludes.h" #ifndef UKERNEL #include "h/types.h" #include "h/uio.h" @@ -49,7 +50,6 @@ RCSID #include "rx/xdr.h" #include "netinet/in.h" #else /* !UKERNEL */ -#include "afs/sysincludes.h" #include "rpc/types.h" #include "rpc/xdr.h" #endif /* !UKERNEL */ -- 2.39.5