Include osreldate.h to determine if if_var.h is needed.

This commit is contained in:
Masafumi Max NAKANE 1997-01-14 05:06:33 +00:00
parent 00d34f8c62
commit d971247863
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=5346
2 changed files with 23 additions and 20 deletions

View file

@ -1,25 +1,21 @@
--- support/ethertalk/bpfiltp.c.orig Fri Jan 10 10:29:53 1997
+++ support/ethertalk/bpfiltp.c Fri Jan 10 11:24:11 1997
@@ -41,7 +41,7 @@
--- support/ethertalk/bpfiltp.c.orig Tue Jan 14 11:15:34 1997
+++ support/ethertalk/bpfiltp.c Tue Jan 14 13:18:36 1997
@@ -41,6 +41,14 @@
#include <net/if.h>
#include <net/bpf.h>
#include <netinet/in.h>
-#include <netinet/if_ether.h>
+#include <net/ethernet.h>
#include <netdb.h>
#include <ctype.h>
@@ -63,6 +63,9 @@
#ifdef __FreeBSD__
#define MULTI_BPF_PKT
#define USE_SIOCGIFCONF
+#ifdef __FreeBSD__
+#if __FreeBSD__ >= 2
+#include <osreldate.h>
+#endif
#endif __FreeBSD__
#ifdef NeXT
@@ -785,7 +788,7 @@
+#if __FreeBSD_version >= 199702
+#include <net/if_var.h>
+#endif
+#endif /*__FreeBSD__*/
#include <netinet/if_ether.h>
#include <netdb.h>
#include <ctype.h>
@@ -785,7 +793,7 @@
bcopy(eaddr, &eh.ether_dhost, 6);
#ifdef PHASE2
@ -28,7 +24,7 @@
/* This should really be fixed in the kernel. */
eh.ether_type = buflen;
#else
@@ -806,7 +809,7 @@
@@ -806,7 +814,7 @@
*q++ = (eph->protocol >> 8) & 0xff;
*q++ = (eph->protocol & 0xff);
#else PHASE2

View file

@ -1,10 +1,17 @@
--- support/uab/aarp.c.orig Thu Jan 9 07:45:00 1997
+++ support/uab/aarp.c Thu Jan 9 07:49:45 1997
@@ -40,6 +40,7 @@
--- support/uab/aarp.c.orig Tue Jan 14 11:11:30 1997
+++ support/uab/aarp.c Tue Jan 14 13:31:06 1997
@@ -40,6 +40,14 @@
#ifdef pyr
#include <netinet/in_ether.h>
#else pyr
+#ifdef __FreeBSD__
+#if __FreeBSD__ >= 2
+#include <osreldate.h>
+#endif
+#if __FreeBSD_version >= 199702
+#include <net/if_var.h>
+#endif
+#endif /*__FreeBSD__*/
#include <netinet/if_ether.h>
#endif pyr