| Patrick Williams | f1e5d69 | 2016-03-30 15:21:19 -0500 | [diff] [blame^] | 1 | From 67645a01a2f3f52625d8dd77f2811a9e213e1b7d Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Sun, 13 Sep 2015 13:28:20 -0700 |
| 4 | Subject: [PATCH] Fix header inclusions for musl |
| 5 | |
| 6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 7 | --- |
| 8 | Upstream-Status: Pending |
| 9 | |
| 10 | gweb/gresolv.c | 1 + |
| 11 | plugins/wifi.c | 3 +-- |
| 12 | src/tethering.c | 2 -- |
| 13 | tools/dhcp-test.c | 1 - |
| 14 | tools/dnsproxy-test.c | 1 + |
| 15 | 5 files changed, 3 insertions(+), 5 deletions(-) |
| 16 | |
| 17 | diff --git a/gweb/gresolv.c b/gweb/gresolv.c |
| 18 | index 3ad8e70..61d6fe8 100644 |
| 19 | --- a/gweb/gresolv.c |
| 20 | +++ b/gweb/gresolv.c |
| 21 | @@ -28,6 +28,7 @@ |
| 22 | #include <stdarg.h> |
| 23 | #include <string.h> |
| 24 | #include <stdlib.h> |
| 25 | +#include <stdio.h> |
| 26 | #include <resolv.h> |
| 27 | #include <sys/types.h> |
| 28 | #include <sys/socket.h> |
| 29 | diff --git a/plugins/wifi.c b/plugins/wifi.c |
| 30 | index dfe849f..99cff3f 100644 |
| 31 | --- a/plugins/wifi.c |
| 32 | +++ b/plugins/wifi.c |
| 33 | @@ -30,9 +30,8 @@ |
| 34 | #include <string.h> |
| 35 | #include <sys/ioctl.h> |
| 36 | #include <sys/socket.h> |
| 37 | -#include <linux/if_arp.h> |
| 38 | -#include <linux/wireless.h> |
| 39 | #include <net/ethernet.h> |
| 40 | +#include <linux/wireless.h> |
| 41 | |
| 42 | #ifndef IFF_LOWER_UP |
| 43 | #define IFF_LOWER_UP 0x10000 |
| 44 | diff --git a/src/tethering.c b/src/tethering.c |
| 45 | index ceeec74..c44cb36 100644 |
| 46 | --- a/src/tethering.c |
| 47 | +++ b/src/tethering.c |
| 48 | @@ -31,10 +31,8 @@ |
| 49 | #include <stdio.h> |
| 50 | #include <sys/ioctl.h> |
| 51 | #include <net/if.h> |
| 52 | -#include <linux/sockios.h> |
| 53 | #include <string.h> |
| 54 | #include <fcntl.h> |
| 55 | -#include <linux/if_tun.h> |
| 56 | #include <netinet/in.h> |
| 57 | #include <linux/if_bridge.h> |
| 58 | |
| 59 | diff --git a/tools/dhcp-test.c b/tools/dhcp-test.c |
| 60 | index c34e10a..eae66fc 100644 |
| 61 | --- a/tools/dhcp-test.c |
| 62 | +++ b/tools/dhcp-test.c |
| 63 | @@ -33,7 +33,6 @@ |
| 64 | #include <arpa/inet.h> |
| 65 | #include <net/route.h> |
| 66 | #include <net/ethernet.h> |
| 67 | -#include <linux/if_arp.h> |
| 68 | |
| 69 | #include <gdhcp/gdhcp.h> |
| 70 | |
| 71 | diff --git a/tools/dnsproxy-test.c b/tools/dnsproxy-test.c |
| 72 | index 551cae9..226ba86 100644 |
| 73 | --- a/tools/dnsproxy-test.c |
| 74 | +++ b/tools/dnsproxy-test.c |
| 75 | @@ -27,6 +27,7 @@ |
| 76 | #include <stdlib.h> |
| 77 | #include <string.h> |
| 78 | #include <unistd.h> |
| 79 | +#include <stdio.h> |
| 80 | #include <arpa/inet.h> |
| 81 | #include <netinet/in.h> |
| 82 | #include <sys/types.h> |
| 83 | -- |
| 84 | 2.5.1 |
| 85 | |