summaryrefslogtreecommitdiff
path: root/sdk/recipes/patches/libcurl/ppc-amigaos
diff options
context:
space:
mode:
Diffstat (limited to 'sdk/recipes/patches/libcurl/ppc-amigaos')
-rw-r--r--sdk/recipes/patches/libcurl/ppc-amigaos/lib.hostip4.c.p17
-rw-r--r--sdk/recipes/patches/libcurl/ppc-amigaos/src.tool_operate.c.p10
2 files changed, 13 insertions, 14 deletions
diff --git a/sdk/recipes/patches/libcurl/ppc-amigaos/lib.hostip4.c.p b/sdk/recipes/patches/libcurl/ppc-amigaos/lib.hostip4.c.p
index 9a2b590..b6287ca 100644
--- a/sdk/recipes/patches/libcurl/ppc-amigaos/lib.hostip4.c.p
+++ b/sdk/recipes/patches/libcurl/ppc-amigaos/lib.hostip4.c.p
@@ -1,6 +1,6 @@
---- lib/hostip4.c 2013-10-23 21:55:34.000000000 +0100
-+++ lib/hostip4.c 2014-01-30 10:19:46.900018967 +0000
-@@ -122,6 +122,11 @@ Curl_addrinfo *Curl_getaddrinfo(struct c
+--- lib/hostip4.c 2017-03-26 23:41:52.304617207 +0100
++++ lib/hostip4.c 2017-03-26 23:41:11.000000000 +0100
+@@ -119,6 +119,10 @@ Curl_addrinfo *Curl_getaddrinfo(struct c
* implying that only threadsafe code and function calls may be used.
*
*/
@@ -8,11 +8,10 @@
+#include <proto/exec.h>
+#include <proto/bsdsocket.h>
+#endif
-+
Curl_addrinfo *Curl_ipv4_resolve_r(const char *hostname,
int port)
{
-@@ -132,6 +137,9 @@ Curl_addrinfo *Curl_ipv4_resolve_r(const
+@@ -129,6 +133,9 @@ Curl_addrinfo *Curl_ipv4_resolve_r(const
struct hostent *h = NULL;
struct in_addr in;
struct hostent *buf = NULL;
@@ -22,7 +21,7 @@
if(Curl_inet_pton(AF_INET, hostname, &in) > 0)
/* This is a dotted IP address 123.123.123.123-style */
-@@ -294,7 +302,20 @@ Curl_addrinfo *Curl_ipv4_resolve_r(const
+@@ -291,7 +298,20 @@ Curl_addrinfo *Curl_ipv4_resolve_r(const
* gethostbyname() is the preferred one.
*/
else {
@@ -38,12 +37,12 @@
+ h = ISocket->gethostbyname((void*)hostname);
+ }
+#else
- h = gethostbyname((void*)hostname);
-+#endif
+ h = gethostbyname((void *)hostname);
++#endif
#endif /* HAVE_GETADDRINFO_THREADSAFE || HAVE_GETHOSTBYNAME_R */
}
-@@ -304,7 +325,14 @@ Curl_addrinfo *Curl_ipv4_resolve_r(const
+@@ -301,7 +321,14 @@ Curl_addrinfo *Curl_ipv4_resolve_r(const
if(buf) /* used a *_r() function */
free(buf);
}
diff --git a/sdk/recipes/patches/libcurl/ppc-amigaos/src.tool_operate.c.p b/sdk/recipes/patches/libcurl/ppc-amigaos/src.tool_operate.c.p
index 945f8a5..b0feb48 100644
--- a/sdk/recipes/patches/libcurl/ppc-amigaos/src.tool_operate.c.p
+++ b/sdk/recipes/patches/libcurl/ppc-amigaos/src.tool_operate.c.p
@@ -1,6 +1,6 @@
---- src/tool_operate.c.orig 2015-02-24 21:49:02.000000000 +0000
-+++ src/tool_operate.c 2015-03-19 22:13:50.477958123 +0000
-@@ -1620,15 +1620,6 @@
+--- src/tool_operate.c 2017-02-23 22:14:58.000000000 +0000
++++ src/tool_operate.c 2017-03-26 23:54:19.624614960 +0100
+@@ -1742,15 +1742,6 @@ static CURLcode operate_do(struct Global
}
}
@@ -13,6 +13,6 @@
- }
-#endif
-
- #ifdef HAVE_UTIME
+ #if defined(HAVE_UTIME) || \
+ (defined(WIN32) && (CURL_SIZEOF_CURL_OFF_T >= 8))
/* File time can only be set _after_ the file has been closed */
- if(!result && config->remote_time && outs.s_isreg && outs.filename) {