cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-30 15:38:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

aiccu: fix musl compatibility

Browse Source 
- Fix redefinition of struct ethhdr
- Restrict the use of res_ninit() and res_nquery() to glibc
- Fix a warning in dn_skipname.c by declaring ns_name_skip() static
- Refresh patches

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
This commit is contained in:
Jo-Philipp Wich
2015-06-16 16:32:21 +02:00
parent 4116e327af
commit e39e96d089
5 changed files with 64 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ipv6/aiccu/patches/300-resolver-uclibc.patch
+18 -7
View File
@@ -1,29 +1,40 @@
--- aiccu/common/resolver.c.orig 2007-09-02 23:10:58.000000000 +0200
+++ aiccu/common/resolver.c 2007-09-02 23:11:01.000000000 +0200
--- a/common/resolver.c
+++ b/common/resolver.c
@@ -26,7 +26,7 @@
int getrrs(const char *label, int rrtype, void gotrec(unsigned int num, int type, const char *record))
{
-#ifdef _LINUX
+#if defined(_LINUX) && !defined(__UCLIBC__)
+#if defined(_LINUX) && defined(__GLIBC__)
struct __res_state res;
#endif
unsigned char answer[8192];
@@ -38,7 +38,7 @@
@@ -38,7 +38,7 @@ int getrrs(const char *label, int rrtype
uint16_t type = 0, class = 0;
uint32_t ttl = 0;
-#ifdef _LINUX
+#if defined(_LINUX) && !defined(__UCLIBC__)
+#if defined(_LINUX) && defined(__GLIBC__)
memset(&res, 0, sizeof(res));
res.options = RES_DEBUG;
res_ninit(&res);
@@ -47,7 +47,7 @@
@@ -47,7 +47,7 @@ int getrrs(const char *label, int rrtype
#endif
memset(answer, 0, sizeof(answer));
-#ifdef _LINUX
+#if defined(_LINUX) && !defined(__UCLIBC__)
+#if defined(_LINUX) && defined(__GLIBC__)
ret = res_nquery(&res, label, C_IN, rrtype, answer, sizeof(answer));
#else
ret = res_query(label, C_IN, rrtype, answer, sizeof(answer));
--- a/common/dn_skipname.c
+++ b/common/dn_skipname.c
@@ -9,7 +9,7 @@
* return:
* 0 on success, -1 (with errno set) on failure.
*/
-int ns_name_skip(const u_char **ptrptr, const u_char *eom)
+static int ns_name_skip(const u_char **ptrptr, const u_char *eom)
{
const u_char *cp;
u_int n;