71107b6cb0
Backport an upstream patch [1] and remove sys/cdefs.h from
ethernet.h as suggested by the musl wiki [2].
Fixes:
http://autobuild.buildroot.net/results/9721496871d104b4cfb68ce133b5f48612cb7e50/
[1] 42de9f8000
[2] http://wiki.musl-libc.org/wiki/FAQ
Signed-off-by: Romain Naour <romain.naour@openwide.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
54 lines
1.5 KiB
Diff
54 lines
1.5 KiB
Diff
From da6e87670ad4639371da056f9e36201a9236dfa2 Mon Sep 17 00:00:00 2001
|
|
From: Romain Naour <romain.naour@openwide.fr>
|
|
Date: Wed, 29 Jul 2015 19:38:46 +0200
|
|
Subject: [PATCH] fix musl build
|
|
|
|
aircrack-ng doesn't build with a musl toolchain due to
|
|
cdefs.h internal glibc header being used in internal
|
|
ethernet.h [1].
|
|
|
|
[1] http://wiki.musl-libc.org/wiki/FAQ
|
|
|
|
Signed-off-by: Romain Naour <romain.naour@openwide.fr>
|
|
---
|
|
src/include/ethernet.h | 20 +++++++++++---------
|
|
1 file changed, 11 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/src/include/ethernet.h b/src/include/ethernet.h
|
|
index 72d5e81..e9d9236 100644
|
|
--- a/src/include/ethernet.h
|
|
+++ b/src/include/ethernet.h
|
|
@@ -389,18 +389,20 @@ void ether_vlan_mtap(struct bpf_if *, struct mbuf *,
|
|
|
|
#else /* _KERNEL */
|
|
|
|
-#include <sys/cdefs.h>
|
|
-
|
|
/*
|
|
* Ethernet address conversion/parsing routines.
|
|
*/
|
|
-__BEGIN_DECLS
|
|
-struct ether_addr *ether_aton(const char *);
|
|
-int ether_hostton(const char *, struct ether_addr *);
|
|
-int ether_line(const char *, struct ether_addr *, char *);
|
|
-char *ether_ntoa(const struct ether_addr *);
|
|
-int ether_ntohost(char *, const struct ether_addr *);
|
|
-__END_DECLS
|
|
+#ifdef __cplusplus
|
|
+extern "C" {
|
|
+#endif
|
|
+ struct ether_addr *ether_aton(const char *);
|
|
+ int ether_hostton(const char *, struct ether_addr *);
|
|
+ int ether_line(const char *, struct ether_addr *, char *);
|
|
+ char *ether_ntoa(const struct ether_addr *);
|
|
+ int ether_ntohost(char *, const struct ether_addr *);
|
|
+#ifdef __cplusplus
|
|
+}
|
|
+#endif
|
|
|
|
#endif /* !_KERNEL */
|
|
|
|
--
|
|
2.4.3
|
|
|