Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-12-27 01:32:08 +00:00
Code Issues Projects Releases Wiki Activity

From: Shaun Jackman <sjackman@gmail.com>

Browse Source 
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.
This commit is contained in:
Rob Landley 2005-05-03 22:30:08 +00:00
parent 93983040c5
commit 0d38301d85
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/inet_common.h
View File

@ -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, extern int INET_rresolve(char *name, size_t len, struct sockaddr_in *s_in,
int numeric, unsigned int netmask); int numeric, unsigned int netmask);
#ifdef CONFIG_FEATURE_IPV6
extern int INET6_resolve(const char *name, struct sockaddr_in6 *sin6); 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); extern int INET6_rresolve(char *name, size_t len, struct sockaddr_in6 *sin6, int numeric);
#endif

6
networking/ifconfig.c
View File

@ -46,8 +46,8 @@
#include <netpacket/packet.h> #include <netpacket/packet.h>
#include <net/ethernet.h> #include <net/ethernet.h>
#else #else
#include <asm/types.h> #include <sys/types.h>
#include <linux/if_ether.h> #include <netinet/if_ether.h>
#endif #endif
#include "inet_common.h" #include "inet_common.h"
#include "busybox.h" #include "busybox.h"
@ -177,7 +177,7 @@ struct in6_ifreq {
struct arg1opt { struct arg1opt {
const char *name; const char *name;
unsigned short selector; int selector;
unsigned short ifr_offset; unsigned short ifr_offset;
}; };