diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2015-03-29 04:30:12 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2015-03-29 04:30:12 +0000 |
| commit | 4a7f1bb54c782ce426bfc49528dcc87b4f3d597f (patch) | |
| tree | 0e233ff46fde7fd457145667ee6bd8a6097c0ef5 | |
| parent | e0e8900edd558055eb0b812dbec6e51523fffe84 (diff) | |
| download | upstream-4a7f1bb54c782ce426bfc49528dcc87b4f3d597f.tar.gz upstream-4a7f1bb54c782ce426bfc49528dcc87b4f3d597f.tar.bz2 upstream-4a7f1bb54c782ce426bfc49528dcc87b4f3d597f.zip | |
iputils: fix musl compile errors
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 45111
| -rw-r--r-- | package/network/utils/iputils/patches/020-include_fixes.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/package/network/utils/iputils/patches/020-include_fixes.patch b/package/network/utils/iputils/patches/020-include_fixes.patch index 0c977498b1..e982dabc37 100644 --- a/package/network/utils/iputils/patches/020-include_fixes.patch +++ b/package/network/utils/iputils/patches/020-include_fixes.patch @@ -8,6 +8,15 @@ #include <sys/param.h> #include <sys/socket.h> #include <linux/sockios.h> +@@ -11,7 +12,7 @@ + #include <sys/ioctl.h> + #include <net/if.h> + #include <sys/uio.h> +-#include <sys/poll.h> ++#include <poll.h> + #include <ctype.h> + #include <errno.h> + #include <string.h> @@ -24,6 +25,10 @@ #include "SNAPSHOT.h" @@ -30,3 +39,33 @@ #include <fcntl.h> #include <netdb.h> #include <arpa/inet.h> +--- a/tracepath.c ++++ b/tracepath.c +@@ -13,6 +13,7 @@ + #include <stdlib.h> + #include <unistd.h> + #include <sys/socket.h> ++#include <sys/time.h> + #include <linux/types.h> + #include <linux/errqueue.h> + #include <errno.h> +--- a/ping.c ++++ b/ping.c +@@ -661,8 +661,15 @@ int send_probe() + + do { + static struct iovec iov = {outpack, 0}; +- static struct msghdr m = { &whereto, sizeof(whereto), +- &iov, 1, &cmsg, 0, 0 }; ++ static struct msghdr m = { ++ .msg_name = &whereto, ++ .msg_namelen = sizeof(whereto), ++ .msg_iov = &iov, ++ .msg_iovlen = 1, ++ .msg_control = &cmsg, ++ .msg_controllen = 0, ++ .msg_flags = 0 ++ }; + m.msg_controllen = cmsg_len; + iov.iov_len = cc; + |