FBSD: update ifa_ifwithnet usage

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

diff --git a/src/rx/rx_kernel.h b/src/rx/rx_kernel.h
index b6ac7f4..f72a322 100644 (file)
--- a/src/rx/rx_kernel.h
+++ b/src/rx/rx_kernel.h
@@ -36,7 +36,7 @@ typedef struct socket *osi_socket;
         CM_TRACE_RXWAKE, ICL_TYPE_STRING, __FILE__, ICL_TYPE_INT32, __LINE__)
 
 extern int osi_utoa(char *buf, size_t len, unsigned long val);
-#define osi_Assert(e) (void)((e) || (osi_AssertFailK(#e, __FILE__, __LINE__), 0))
+#define osi_Assert(exp) (void)((exp) || (osi_AssertFailK( #exp , __FILE__, __LINE__), 0))
 
 #define        osi_Msg printf)(
 #define osi_VMsg vprintf)(
@@ -54,7 +54,7 @@ extern int osi_utoa(char *buf, size_t len, unsigned long val);
 #endif
 #define rx_ifnet_mtu(x) (x)->if_mtu
 #define rx_ifnet_flags(x) (x?(x)->if_flags:0)
-#ifdef AFS_OBSD46_ENV
+#if defined(AFS_OBSD46_ENV) || defined(AFS_FBSD81_ENV)
 #define rx_ifaddr_withnet(x) ifa_ifwithnet(x, 0)
 #else
 #define rx_ifaddr_withnet(x) ifa_ifwithnet(x)