Fri Apr 23 15:30:30 2010 UTC ()
no [longer?] need to define _KERNEL when including <net/route.h>


(plunky)
diff -r1.62 -r1.63 src/usr.sbin/route6d/route6d.c

cvs diff -r1.62 -r1.63 src/usr.sbin/route6d/route6d.c (expand / switch to unified diff)

--- src/usr.sbin/route6d/route6d.c 2009/04/19 08:16:59 1.62
+++ src/usr.sbin/route6d/route6d.c 2010/04/23 15:30:30 1.63
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: route6d.c,v 1.62 2009/04/19 08:16:59 lukem Exp $ */ 1/* $NetBSD: route6d.c,v 1.63 2010/04/23 15:30:30 plunky Exp $ */
2/* $KAME: route6d.c,v 1.94 2002/10/26 20:08:55 itojun Exp $ */ 2/* $KAME: route6d.c,v 1.94 2002/10/26 20:08:55 itojun Exp $ */
3 3
4/* 4/*
5 * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. 5 * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
6 * All rights reserved. 6 * All rights reserved.
7 *  7 *
8 * Redistribution and use in source and binary forms, with or without 8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions 9 * modification, are permitted provided that the following conditions
10 * are met: 10 * are met:
11 * 1. Redistributions of source code must retain the above copyright 11 * 1. Redistributions of source code must retain the above copyright
12 * notice, this list of conditions and the following disclaimer. 12 * notice, this list of conditions and the following disclaimer.
13 * 2. Redistributions in binary form must reproduce the above copyright 13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the 14 * notice, this list of conditions and the following disclaimer in the
@@ -22,27 +22,27 @@ @@ -22,27 +22,27 @@
22 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 22 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
23 * ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE 23 * ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
24 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 24 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
25 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 25 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
26 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 26 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
27 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 27 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
28 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 28 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
29 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 29 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
30 * SUCH DAMAGE. 30 * SUCH DAMAGE.
31 */ 31 */
32 32
33#include <sys/cdefs.h> 33#include <sys/cdefs.h>
34#ifndef lint 34#ifndef lint
35__RCSID("$NetBSD: route6d.c,v 1.62 2009/04/19 08:16:59 lukem Exp $"); 35__RCSID("$NetBSD: route6d.c,v 1.63 2010/04/23 15:30:30 plunky Exp $");
36#endif 36#endif
37 37
38#include <stdbool.h> 38#include <stdbool.h>
39#include <stdio.h> 39#include <stdio.h>
40 40
41#include <time.h> 41#include <time.h>
42#include <unistd.h> 42#include <unistd.h>
43#include <stdlib.h> 43#include <stdlib.h>
44#include <string.h> 44#include <string.h>
45#include <signal.h> 45#include <signal.h>
46#include <stdarg.h> 46#include <stdarg.h>
47#include <syslog.h> 47#include <syslog.h>
48#include <stddef.h> 48#include <stddef.h>
@@ -52,31 +52,27 @@ __RCSID("$NetBSD: route6d.c,v 1.62 2009/ @@ -52,31 +52,27 @@ __RCSID("$NetBSD: route6d.c,v 1.62 2009/
52#include <poll.h> 52#include <poll.h>
53 53
54#include <sys/types.h> 54#include <sys/types.h>
55#include <sys/param.h> 55#include <sys/param.h>
56#include <sys/file.h> 56#include <sys/file.h>
57#include <sys/socket.h> 57#include <sys/socket.h>
58#include <sys/ioctl.h> 58#include <sys/ioctl.h>
59#include <sys/sysctl.h> 59#include <sys/sysctl.h>
60#include <sys/uio.h> 60#include <sys/uio.h>
61#include <net/if.h> 61#include <net/if.h>
62#if defined(__FreeBSD__) && __FreeBSD__ >= 3 62#if defined(__FreeBSD__) && __FreeBSD__ >= 3
63#include <net/if_var.h> 63#include <net/if_var.h>
64#endif /* __FreeBSD__ >= 3 */ 64#endif /* __FreeBSD__ >= 3 */
65#define KERNEL 1 
66#define _KERNEL 1 
67#include <net/route.h> 65#include <net/route.h>
68#undef KERNEL 
69#undef _KERNEL 
70#include <netinet/in.h> 66#include <netinet/in.h>
71#include <netinet/in_var.h> 67#include <netinet/in_var.h>
72#include <netinet/ip6.h> 68#include <netinet/ip6.h>
73#include <netinet/udp.h> 69#include <netinet/udp.h>
74#include <netdb.h> 70#include <netdb.h>
75#include <ifaddrs.h> 71#include <ifaddrs.h>
76 72
77#include <arpa/inet.h> 73#include <arpa/inet.h>
78 74
79#include "route6d.h" 75#include "route6d.h"
80 76
81#define MAXFILTER 40 77#define MAXFILTER 40
82 78