summaryrefslogtreecommitdiff
path: root/sdk/recipes/patches/libcurl/m68k-unknown-amigaos
diff options
context:
space:
mode:
Diffstat (limited to 'sdk/recipes/patches/libcurl/m68k-unknown-amigaos')
-rw-r--r--sdk/recipes/patches/libcurl/m68k-unknown-amigaos/lib.amigaos.c.p11
-rw-r--r--sdk/recipes/patches/libcurl/m68k-unknown-amigaos/lib.amigaos.h.p11
-rw-r--r--sdk/recipes/patches/libcurl/m68k-unknown-amigaos/lib.curl_setup.h.p16
-rw-r--r--sdk/recipes/patches/libcurl/m68k-unknown-amigaos/src.tool_getpass.c.p13
-rw-r--r--sdk/recipes/patches/libcurl/m68k-unknown-amigaos/src.tool_operate.c.p18
5 files changed, 8 insertions, 61 deletions
diff --git a/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/lib.amigaos.c.p b/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/lib.amigaos.c.p
deleted file mode 100644
index 5b6c913..0000000
--- a/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/lib.amigaos.c.p
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/amigaos.c 2014-06-11 18:52:29.000000000 +0100
-+++ lib/amigaos.c 2014-12-20 21:34:06.686013103 +0000
-@@ -22,7 +22,7 @@
-
- #include "curl_setup.h"
-
--#if defined(__AMIGA__) && !defined(__ixemul__)
-+#if 0
-
- #include <amitcp/socketbasetags.h>
-
diff --git a/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/lib.amigaos.h.p b/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/lib.amigaos.h.p
deleted file mode 100644
index de22d82..0000000
--- a/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/lib.amigaos.h.p
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/amigaos.h 2014-06-11 18:52:29.000000000 +0100
-+++ lib/amigaos.h 2014-12-20 21:34:20.390013061 +0000
-@@ -23,7 +23,7 @@
- ***************************************************************************/
- #include "curl_setup.h"
-
--#if defined(__AMIGA__) && !defined(__ixemul__)
-+#if 0
-
- bool Curl_amiga_init();
- void Curl_amiga_cleanup();
diff --git a/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/lib.curl_setup.h.p b/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/lib.curl_setup.h.p
index c9b9af3..ba595ca 100644
--- a/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/lib.curl_setup.h.p
+++ b/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/lib.curl_setup.h.p
@@ -1,10 +1,10 @@
---- lib/curl_setup.h 2014-08-25 22:45:11.000000000 +0100
-+++ lib/curl_setup.h 2014-12-20 21:35:26.494012868 +0000
-@@ -311,7 +311,6 @@
- # include <exec/execbase.h>
- # include <proto/exec.h>
- # include <proto/dos.h>
--# define select(a,b,c,d,e) WaitSelect(a,b,c,d,e,0)
- # endif
+--- lib/curl_setup.h.orig 2017-10-10 15:19:45.611896396 +0100
++++ lib/curl_setup.h 2017-10-17 15:42:25.304921197 +0100
+@@ -314,7 +314,6 @@
+ * In clib2 arpa/inet.h warns that some prototypes may clash
+ * with bsdsocket.library. This avoids the definition of those.
+ */
+-# define __NO_NET_API
#endif
+ #include <stdio.h>
diff --git a/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/src.tool_getpass.c.p b/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/src.tool_getpass.c.p
deleted file mode 100644
index 7de5cba..0000000
--- a/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/src.tool_getpass.c.p
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./tool_getpass.c 2014-06-11 18:52:29.000000000 +0100
-+++ src/tool_getpass.c 2015-01-05 21:42:31.826011647 +0000
-@@ -24,6 +24,10 @@
- #ifndef HAVE_GETPASS_R
- /* this file is only for systems without getpass_r() */
-
-+#ifdef __AMIGA__
-+#undef HAVE_TERMIOS_H
-+#endif
-+
- #ifdef HAVE_FCNTL_H
- # include <fcntl.h>
- #endif
diff --git a/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/src.tool_operate.c.p b/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/src.tool_operate.c.p
deleted file mode 100644
index 945f8a5..0000000
--- a/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/src.tool_operate.c.p
+++ /dev/null
@@ -1,18 +0,0 @@
---- 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 @@
- }
- }
-
--#ifdef __AMIGA__
-- if(!result && outs.s_isreg && outs.filename) {
-- /* Set the url (up to 80 chars) as comment for the file */
-- if(strlen(url) > 78)
-- url[79] = '\0';
-- SetComment(outs.filename, url);
-- }
--#endif
--
- #ifdef HAVE_UTIME
- /* File time can only be set _after_ the file has been closed */
- if(!result && config->remote_time && outs.s_isreg && outs.filename) {