From 8817308a87ca76bc47a0f5564b97c7942b3be04a Mon Sep 17 00:00:00 2001 From: Benjamin Kaduk Date: Fri, 24 Jan 2014 12:00:20 -0500 Subject: [PATCH] FBSD: catch up to 1997 and include if_var.h with if.h The commit message for upstream's r257244 change includes: - Make the prophecy from 1997 happen and remove if_var.h inclusion from if.h. Despite the clear public posting, we were caught unawares. We made it down to the cellar despite the missing stairs, but "Beware of the Leopard" caused us to turn back, apparently. Since if.h is included in many places and if_var.h is not present on all OSes, pull the if.h inclusion into the common kernel headers for afs/ and rx/ , and add in if_var.h (as well as the sys/socket.h prerequisite). Change-Id: I228c1560a128388c187804e05c0dd2500fb2853e Reviewed-on: http://gerrit.openafs.org/10754 Tested-by: BuildBot Reviewed-by: Derrick Brashear --- src/afs/sysincludes.h | 6 ++++++ src/rx/rx_kcommon.h | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/src/afs/sysincludes.h b/src/afs/sysincludes.h index 3e3a172519..10343b8679 100644 --- a/src/afs/sysincludes.h +++ b/src/afs/sysincludes.h @@ -202,6 +202,12 @@ typedef unsigned short etap_event_t; # include "h/systm.h" # include "h/time.h" +# ifdef AFS_FBSD_ENV +# include +# include +# include +# endif + # ifdef AFS_AIX_ENV # ifdef AFS_AIX41_ENV # include "sys/statfs.h" diff --git a/src/rx/rx_kcommon.h b/src/rx/rx_kcommon.h index 9b04123856..92752dbab4 100644 --- a/src/rx/rx_kcommon.h +++ b/src/rx/rx_kcommon.h @@ -124,6 +124,11 @@ typedef unsigned short etap_event_t; #include "h/file.h" #endif #include "net/if.h" +# ifdef AFS_FBSD_ENV +# include +# include +# include +# endif #endif #if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX22_ENV) && !defined(AFS_DARWIN_ENV) #include "netinet/in_var.h"