49 lines
2 KiB
Text
49 lines
2 KiB
Text
$NetBSD: patch-ac,v 1.1 2006/02/24 20:17:55 joerg Exp $
|
|
|
|
--- defs.h.orig 2003-09-02 10:12:24.000000000 +0000
|
|
+++ defs.h
|
|
@@ -70,7 +70,7 @@
|
|
#endif /* SYSV || __bsdi__ || SunOS 4.x */
|
|
#include <sys/time.h>
|
|
#include <net/if.h>
|
|
-#if defined(__FreeBSD__) && __FreeBSD__ >= 3
|
|
+#if defined(__DragonFly__) || (defined(__FreeBSD__) && __FreeBSD__ >= 3)
|
|
#include <net/if_var.h>
|
|
#endif /* __FreeBSD__ >= 3 */
|
|
#include <netinet/in.h>
|
|
@@ -85,12 +85,16 @@
|
|
#ifdef __FreeBSD__ /* sigh */
|
|
#include <osreldate.h>
|
|
#endif /* __FreeBSD__ */
|
|
-#if (defined(__bsdi__)) || (defined(__FreeBSD__) && (__FreeBSD_version >= 220000))
|
|
+#if (defined(__bsdi__)) || (defined(__FreeBSD__) && (__FreeBSD_version >= 220000)) || defined(__DragonFly__)
|
|
#define rtentry kernel_rtentry
|
|
#include <net/route.h>
|
|
#undef rtentry
|
|
#endif /* __bsdi__ or __FreeBSD_version >= 220000 */
|
|
+#if defined(__DragonFly__)
|
|
+#include <net/ip_mroute/ip_mroute.h>
|
|
+#else
|
|
#include <netinet/ip_mroute.h>
|
|
+#endif
|
|
#include <netinet6/ip6_mroute.h>
|
|
#include <strings.h>
|
|
#ifdef RSRR
|
|
@@ -142,7 +146,7 @@ typedef void (*ihfunc_t) __P((int, fd_se
|
|
|
|
/* Versions of Solaris older than 2.6 don't have routing sockets. */
|
|
/* XXX TODO: check FreeBSD version and add all other platforms */
|
|
-#if ((defined(SunOS) && SunOS >=56) || (defined __FreeBSD__) || (defined IRIX) || (defined __bsdi__) || defined(__NetBSD__) || defined(__OpenBSD__))
|
|
+#if ((defined(SunOS) && SunOS >=56) || (defined __FreeBSD__) || (defined IRIX) || (defined __bsdi__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__))
|
|
#define HAVE_ROUTING_SOCKETS
|
|
#endif
|
|
|
|
@@ -436,7 +440,7 @@ extern char *net6name __P((struct in6_ad
|
|
|
|
/* kern.c */
|
|
extern void k_set_rcvbuf __P((int socket, int bufsize, int minsize));
|
|
-extern void k_hdr_include __P((int socket, int bool));
|
|
+extern void k_hdr_include __P((int socket, int));
|
|
extern void k_set_hlim __P((int socket, int t));
|
|
extern void k_set_loop __P((int socket, int l));
|
|
extern void k_set_if __P((int socket, u_int ifindex));
|