aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIsaac Dunham <idunham@lavabit.com>2013-04-14 02:58:12 -0500
committerIsaac Dunham <idunham@lavabit.com>2013-04-14 02:58:12 -0500
commit88e2cb66b87fc0ce5778c301246f867789811b63 (patch)
treef125276338723f9ef3462ed8ff5113d2248a3d19
parent18993e2f3af291eea7a175547862d057b7d83708 (diff)
downloadtoybox-88e2cb66b87fc0ce5778c301246f867789811b63.tar.gz
ifconfig uses __caddr_t in one location; this is not guaranteed to work everywhere. It does not compile OOB on musl, so I changed it to the portable equivalent, char *. This compiles on musl, and should compile anywhere.
-rw-r--r--toys/pending/ifconfig.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/toys/pending/ifconfig.c b/toys/pending/ifconfig.c
index d5aa21e9..605275de 100644
--- a/toys/pending/ifconfig.c
+++ b/toys/pending/ifconfig.c
@@ -603,7 +603,7 @@ static void set_data(int sockfd, struct ifreq *ifre, char *kval, int request, ch
unsigned long val = strtoul(kval, NULL, 0);
char *ptr;
ptr = ((char *) ifre) + offsetof(struct ifreq, ifr_data);
- (*(__caddr_t *)ptr) = (__caddr_t)val;
+ (*(char * *)ptr) = (char *)val;
if(ioctl(sockfd, request, ifre) < 0) {
perror_exit((char *)req_name);