Gitweb links:
...log
http://git.netsurf-browser.org/toolchains.git/shortlog/97654a18425898ade8c97b7985791d86565b885c
...commit
http://git.netsurf-browser.org/toolchains.git/commit/97654a18425898ade8c97b7985791d86565b885c
...tree
http://git.netsurf-browser.org/toolchains.git/tree/97654a18425898ade8c97b7985791d86565b885c
The branch, master has been updated
via 97654a18425898ade8c97b7985791d86565b885c (commit)
from 80fe05aa682574cc4d5977c1614976e122aa2b08 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/toolchains.git/commit/?id=97654a18425898ade8c97b7985791d86565b885c
commit 97654a18425898ade8c97b7985791d86565b885c
Author: John-Mark Bell <[email protected]>
Commit: John-Mark Bell <[email protected]>
SDK/c-ares: more patch refreshing for 1.23.0
diff --git a/sdk/recipes/patches/libcares/m68k-unknown-amigaos/ipv6-support.p
b/sdk/recipes/patches/libcares/m68k-unknown-amigaos/ipv6-support.p
index 873f638..ce60c44 100644
--- a/sdk/recipes/patches/libcares/m68k-unknown-amigaos/ipv6-support.p
+++ b/sdk/recipes/patches/libcares/m68k-unknown-amigaos/ipv6-support.p
@@ -60,11 +60,11 @@
* Find number of matching initial bits between the two addresses a1 and a2.
*/
+#ifndef HAVE_STRUCT_SOCKADDR_IN6
-+static int common_prefix_len(const struct ares_in6_addr *a1,
-+ const struct ares_in6_addr *a2)
++static size_t common_prefix_len(const struct ares_in6_addr *a1,
++ const struct ares_in6_addr *a2)
+#else
- static int common_prefix_len(const struct in6_addr *a1,
- const struct in6_addr *a2)
+ static size_t common_prefix_len(const struct in6_addr *a1,
+ const struct in6_addr *a2)
+#endif
{
const unsigned char *p1 = (const unsigned char *)a1;
diff --git a/sdk/recipes/patches/libcares/ppc-amigaos/ipv6-support.p
b/sdk/recipes/patches/libcares/ppc-amigaos/ipv6-support.p
index 08fefd3..f34fb45 100644
--- a/sdk/recipes/patches/libcares/ppc-amigaos/ipv6-support.p
+++ b/sdk/recipes/patches/libcares/ppc-amigaos/ipv6-support.p
@@ -59,11 +59,11 @@
* Find number of matching initial bits between the two addresses a1 and a2.
*/
+#ifndef HAVE_STRUCT_SOCKADDR_IN6
-+static int common_prefix_len(const struct ares_in6_addr *a1,
-+ const struct ares_in6_addr *a2)
++static size_t common_prefix_len(const struct ares_in6_addr *a1,
++ const struct ares_in6_addr *a2)
+#else
- static int common_prefix_len(const struct in6_addr *a1,
- const struct in6_addr *a2)
+ static size_t common_prefix_len(const struct in6_addr *a1,
+ const struct in6_addr *a2)
+#endif
{
const unsigned char *p1 = (const unsigned char *)a1;
-----------------------------------------------------------------------
Summary of changes:
.../patches/libcares/m68k-unknown-amigaos/ipv6-support.p | 8 ++++----
sdk/recipes/patches/libcares/ppc-amigaos/ipv6-support.p | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/sdk/recipes/patches/libcares/m68k-unknown-amigaos/ipv6-support.p
b/sdk/recipes/patches/libcares/m68k-unknown-amigaos/ipv6-support.p
index 873f638..ce60c44 100644
--- a/sdk/recipes/patches/libcares/m68k-unknown-amigaos/ipv6-support.p
+++ b/sdk/recipes/patches/libcares/m68k-unknown-amigaos/ipv6-support.p
@@ -60,11 +60,11 @@
* Find number of matching initial bits between the two addresses a1 and a2.
*/
+#ifndef HAVE_STRUCT_SOCKADDR_IN6
-+static int common_prefix_len(const struct ares_in6_addr *a1,
-+ const struct ares_in6_addr *a2)
++static size_t common_prefix_len(const struct ares_in6_addr *a1,
++ const struct ares_in6_addr *a2)
+#else
- static int common_prefix_len(const struct in6_addr *a1,
- const struct in6_addr *a2)
+ static size_t common_prefix_len(const struct in6_addr *a1,
+ const struct in6_addr *a2)
+#endif
{
const unsigned char *p1 = (const unsigned char *)a1;
diff --git a/sdk/recipes/patches/libcares/ppc-amigaos/ipv6-support.p
b/sdk/recipes/patches/libcares/ppc-amigaos/ipv6-support.p
index 08fefd3..f34fb45 100644
--- a/sdk/recipes/patches/libcares/ppc-amigaos/ipv6-support.p
+++ b/sdk/recipes/patches/libcares/ppc-amigaos/ipv6-support.p
@@ -59,11 +59,11 @@
* Find number of matching initial bits between the two addresses a1 and a2.
*/
+#ifndef HAVE_STRUCT_SOCKADDR_IN6
-+static int common_prefix_len(const struct ares_in6_addr *a1,
-+ const struct ares_in6_addr *a2)
++static size_t common_prefix_len(const struct ares_in6_addr *a1,
++ const struct ares_in6_addr *a2)
+#else
- static int common_prefix_len(const struct in6_addr *a1,
- const struct in6_addr *a2)
+ static size_t common_prefix_len(const struct in6_addr *a1,
+ const struct in6_addr *a2)
+#endif
{
const unsigned char *p1 = (const unsigned char *)a1;
--
Cross-compilation toolchains and environments
_______________________________________________
netsurf-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
