diff options
| author | Joel Sherrill <joel.sherrill@oarcorp.com> | 2012-10-23 14:20:32 -0500 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@oarcorp.com> | 2012-10-23 14:21:44 -0500 |
| commit | df900d3a8634ce7965392da1dadf475060ede907 (patch) | |
| tree | 15ba3597f26f691abfcdc55b8e55969be7efd412 | |
| parent | Merge branch 'master' of ssh://git.rtems.org/data/git/rtems-libbsd (diff) | |
| download | rtems-libbsd-df900d3a8634ce7965392da1dadf475060ede907.tar.bz2 | |
Commands: Build with IPV6 enabled
| -rw-r--r-- | freebsd-userspace/commands/usr.bin/netstat/inet6.c | 18 | ||||
| -rw-r--r-- | freebsd-userspace/commands/usr.bin/netstat/mroute6.c | 11 | ||||
| -rw-r--r-- | freebsd-userspace/lib/libc/net/name6.c | 7 |
3 files changed, 35 insertions, 1 deletions
diff --git a/freebsd-userspace/commands/usr.bin/netstat/inet6.c b/freebsd-userspace/commands/usr.bin/netstat/inet6.c index 254868d5..64b645ee 100644 --- a/freebsd-userspace/commands/usr.bin/netstat/inet6.c +++ b/freebsd-userspace/commands/usr.bin/netstat/inet6.c @@ -41,31 +41,47 @@ static char sccsid[] = "@(#)inet6.c 8.4 (Berkeley) 4/20/94"; #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#ifdef __rtems__ +#include "port_before.h" +#endif #ifdef INET6 #include <sys/param.h> #include <sys/socket.h> #include <sys/socketvar.h> #include <sys/ioctl.h> -#include <sys/mbuf.h> #ifdef __rtems__ +#include <freebsd/sys/mbuf.h> #include <freebsd/sys/protosw.h> #else +#include <sys/mbuf.h> #include <sys/protosw.h> #endif #include <sys/sysctl.h> #include <net/route.h> #include <net/if.h> +#ifdef __rtems__ +#include <freebsd/net/if_var.h> +#else #include <net/if_var.h> +#endif #include <netinet/in.h> #include <netinet/ip6.h> #include <netinet/icmp6.h> #include <netinet/in_systm.h> +#ifdef __rtems__ +#include <freebsd/netinet6/in6_pcb.h> +#include <freebsd/netinet6/in6_var.h> +#include <freebsd/netinet6/ip6_var.h> +#include <freebsd/netinet6/pim6_var.h> +#include <freebsd/netinet6/raw_ip6.h> +#else #include <netinet6/in6_pcb.h> #include <netinet6/in6_var.h> #include <netinet6/ip6_var.h> #include <netinet6/pim6_var.h> #include <netinet6/raw_ip6.h> +#endif #include <arpa/inet.h> #include <netdb.h> diff --git a/freebsd-userspace/commands/usr.bin/netstat/mroute6.c b/freebsd-userspace/commands/usr.bin/netstat/mroute6.c index cd7d8d25..4fff5462 100644 --- a/freebsd-userspace/commands/usr.bin/netstat/mroute6.c +++ b/freebsd-userspace/commands/usr.bin/netstat/mroute6.c @@ -68,6 +68,9 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#ifdef __rtems__ +#include "port_before.h" +#endif #ifdef INET6 #include <sys/param.h> #include <sys/queue.h> @@ -87,7 +90,11 @@ __FBSDID("$FreeBSD$"); #include <sys/time.h> #include <net/if.h> +#ifdef __rtems__ +#include <freebsd/net/if_var.h> +#else #include <net/if_var.h> +#endif #include <net/route.h> #include <netinet/in.h> @@ -98,7 +105,11 @@ __FBSDID("$FreeBSD$"); #include <stdlib.h> #define KERNEL 1 +#ifdef __rtems__ +#include <freebsd/netinet6/ip6_mroute.h> +#else #include <netinet6/ip6_mroute.h> +#endif #undef KERNEL #include "netstat.h" diff --git a/freebsd-userspace/lib/libc/net/name6.c b/freebsd-userspace/lib/libc/net/name6.c index d6fb6782..20763f88 100644 --- a/freebsd-userspace/lib/libc/net/name6.c +++ b/freebsd-userspace/lib/libc/net/name6.c @@ -99,11 +99,18 @@ __FBSDID("$FreeBSD$"); #include <netinet/in.h> #ifdef INET6 #include <net/if.h> +#ifdef __rtems__ +#include <freebsd/net/if_var.h> +#include <sys/sysctl.h> +#include <sys/ioctl.h> +#include <freebsd/netinet6/in6_var.h> /* XXX */ +#else #include <net/if_var.h> #include <sys/sysctl.h> #include <sys/ioctl.h> #include <netinet6/in6_var.h> /* XXX */ #endif +#endif #include <arpa/inet.h> #include <arpa/nameser.h> |