From b29f49f0e1de8dd5dc1fb77af23035ede9303926 Mon Sep 17 00:00:00 2001 From: landley Date: Tue, 3 May 2005 22:30:08 +0000 Subject: From: Shaun Jackman To: busybox@mail.codepoet.org Wrap sockaddr_in6 in a ifdef CONFIG_FEATURE_IPV6. Include sys/types.h instead of asm/types.h. Include netinet/if_ether.h instead of linux/if_ether.h The ioctl request argument is an int, not an unsigned short. git-svn-id: svn://busybox.net/trunk/busybox@10242 69ca8d6d-28ef-0310-b511-8ec308f3f277 --- include/inet_common.h | 2 ++ networking/ifconfig.c | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/include/inet_common.h b/include/inet_common.h index afea5deaa..4a9c3a2d7 100644 --- a/include/inet_common.h +++ b/include/inet_common.h @@ -29,5 +29,7 @@ extern int INET_resolve(const char *name, struct sockaddr_in *s_in, int hostfirs extern int INET_rresolve(char *name, size_t len, struct sockaddr_in *s_in, int numeric, unsigned int netmask); +#ifdef CONFIG_FEATURE_IPV6 extern int INET6_resolve(const char *name, struct sockaddr_in6 *sin6); extern int INET6_rresolve(char *name, size_t len, struct sockaddr_in6 *sin6, int numeric); +#endif diff --git a/networking/ifconfig.c b/networking/ifconfig.c index 4e3df2982..fc7798f2d 100644 --- a/networking/ifconfig.c +++ b/networking/ifconfig.c @@ -46,8 +46,8 @@ #include #include #else -#include -#include +#include +#include #endif #include "inet_common.h" #include "busybox.h" @@ -177,7 +177,7 @@ struct in6_ifreq { struct arg1opt { const char *name; - unsigned short selector; + int selector; unsigned short ifr_offset; }; -- cgit v1.2.3-55-g6feb