jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-19 07:20:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

FBSD: catch up to 1997 and include if_var.h with if.h

Browse Source 
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 <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>
This commit is contained in:
Benjamin Kaduk 2014-01-24 12:00:20 -05:00 committed by Derrick Brashear
parent 7f58e4ac45
commit 8817308a87
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/afs/sysincludes.h
View File

@ -202,6 +202,12 @@ typedef unsigned short etap_event_t;
# include "h/systm.h" # include "h/systm.h"
# include "h/time.h" # include "h/time.h"
# ifdef AFS_FBSD_ENV
# include <sys/socket.h>
# include <net/if.h>
# include <net/if_var.h>
# endif
# ifdef AFS_AIX_ENV # ifdef AFS_AIX_ENV
# ifdef AFS_AIX41_ENV # ifdef AFS_AIX41_ENV
# include "sys/statfs.h" # include "sys/statfs.h"

5
src/rx/rx_kcommon.h
View File

@ -124,6 +124,11 @@ typedef unsigned short etap_event_t;
#include "h/file.h" #include "h/file.h"
#endif #endif
#include "net/if.h" #include "net/if.h"
# ifdef AFS_FBSD_ENV
# include <sys/socket.h>
# include <net/if.h>
# include <net/if_var.h>
# endif
#endif #endif
#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX22_ENV) && !defined(AFS_DARWIN_ENV) #if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX22_ENV) && !defined(AFS_DARWIN_ENV)
#include "netinet/in_var.h" #include "netinet/in_var.h"