python-dataproperty: bump version to 0.17.0
[buildroot-gz.git] / package / bluez5_utils / 0001-tools-bneptest.c-Remove-include-linux-if_bridge.h-to.patch
blobe8a3ff47bf16b88f0b741d9bfe6cd35ca627414c
1 From 7c136b4f1941e5bb2a6c8d93985c5734c6aefb29 Mon Sep 17 00:00:00 2001
2 From: Bernd Kuhls <bernd.kuhls@writeme.com>
3 Date: Sun, 22 May 2016 09:48:57 +0200
4 Subject: [PATCH 1/1] tools/bneptest.c: Remove include linux/if_bridge.h to fix
5 musl build
7 Inspired by busybox commit:
8 https://git.busybox.net/busybox/commit/networking/brctl.c?id=5fa6d1a632505789409a2ba6cf8e112529f9db18
10 The build error was found by the autobuilders of the buildroot project:
11 http://autobuild.buildroot.net/results/eba/ebaa0bcb9c325aa6ed0bbd6c7ec75d44befa7645/build-end.log
13 Signed-off-by: Bernd Kuhls <bernd.kuhls@writeme.com>
14 (Patch sent upstream:
15 http://article.gmane.org/gmane.linux.bluez.kernel/67621)
16 ---
17 tools/bneptest.c | 12 +++++++++++-
18 1 file changed, 11 insertions(+), 1 deletion(-)
20 diff --git a/tools/bneptest.c b/tools/bneptest.c
21 index 1404252..b832d72 100644
22 --- a/tools/bneptest.c
23 +++ b/tools/bneptest.c
24 @@ -36,7 +36,17 @@
25 #include <net/if.h>
26 #include <linux/sockios.h>
27 #include <netinet/in.h>
28 -#include <linux/if_bridge.h>
29 +/* #include <linux/if_bridge.h>
30 + * breaks on musl: we already included netinet/in.h,
31 + * if we also include <linux/if_bridge.h> here, we get this:
32 + * In file included from /usr/include/linux/if_bridge.h:18,
33 + * from networking/brctl.c:67:
34 + * /usr/include/linux/in6.h:32: error: redefinition of 'struct in6_addr'
35 + * /usr/include/linux/in6.h:49: error: redefinition of 'struct sockaddr_in6'
36 + * /usr/include/linux/in6.h:59: error: redefinition of 'struct ipv6_mreq'
37 + */
38 +/* From <linux/if_bridge.h> */
39 +#define BRCTL_SET_BRIDGE_FORWARD_DELAY 8
41 #include <glib.h>
43 --
44 2.8.1