diff options
| author | John-Mark Bell <jmb@netsurf-browser.org> | 2014-01-15 01:59:34 +0000 |
|---|---|---|
| committer | John-Mark Bell <jmb@netsurf-browser.org> | 2014-01-17 18:55:43 +0000 |
| commit | 2b3c726e152915dc98ebcd405b09ab468f929896 (patch) | |
| tree | 293c09b0c1415d7b1c03628bf8ce17a599fed9de /sdk/recipes/patches/libcurl/ppc-amigaos | |
| parent | 22a896811efe3ffc1c03c767baf6473765a13286 (diff) | |
| download | toolchains-2b3c726e152915dc98ebcd405b09ab468f929896.tar.gz toolchains-2b3c726e152915dc98ebcd405b09ab468f929896.tar.bz2 | |
Update libcurl patches for ppc-amigaos / 7.34.0
Diffstat (limited to 'sdk/recipes/patches/libcurl/ppc-amigaos')
| -rw-r--r-- | sdk/recipes/patches/libcurl/ppc-amigaos/lib.amigaos.c.p | 2 | ||||
| -rw-r--r-- | sdk/recipes/patches/libcurl/ppc-amigaos/lib.amigaos.h.p | 2 | ||||
| -rw-r--r-- | sdk/recipes/patches/libcurl/ppc-amigaos/lib.curl_setup.h.p (renamed from sdk/recipes/patches/libcurl/ppc-amigaos/lib.setup.h.p) | 6 | ||||
| -rw-r--r-- | sdk/recipes/patches/libcurl/ppc-amigaos/src.tool_operate.c.p | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/sdk/recipes/patches/libcurl/ppc-amigaos/lib.amigaos.c.p b/sdk/recipes/patches/libcurl/ppc-amigaos/lib.amigaos.c.p index 7bb19d1..9833c94 100644 --- a/sdk/recipes/patches/libcurl/ppc-amigaos/lib.amigaos.c.p +++ b/sdk/recipes/patches/libcurl/ppc-amigaos/lib.amigaos.c.p @@ -2,7 +2,7 @@ +++ lib/amigaos.c 2012-10-19 21:38:09.000000000 +0100 @@ -22,7 +22,7 @@ - #include "setup.h" + #include "curl_setup.h" -#if defined(__AMIGA__) && !defined(__ixemul__) +#if defined(__AMIGA__) && !(defined(__ixemul__) || defined(__amigaos4__)) diff --git a/sdk/recipes/patches/libcurl/ppc-amigaos/lib.amigaos.h.p b/sdk/recipes/patches/libcurl/ppc-amigaos/lib.amigaos.h.p index 27d3a13..050bea7 100644 --- a/sdk/recipes/patches/libcurl/ppc-amigaos/lib.amigaos.h.p +++ b/sdk/recipes/patches/libcurl/ppc-amigaos/lib.amigaos.h.p @@ -2,7 +2,7 @@ +++ lib/amigaos.h 2012-10-19 21:37:26.000000000 +0100 @@ -23,7 +23,7 @@ ***************************************************************************/ - #include "setup.h" + #include "curl_setup.h" -#if defined(__AMIGA__) && !defined(__ixemul__) +#if defined(__AMIGA__) && !(defined(__ixemul__) || defined(__amigaos4__)) diff --git a/sdk/recipes/patches/libcurl/ppc-amigaos/lib.setup.h.p b/sdk/recipes/patches/libcurl/ppc-amigaos/lib.curl_setup.h.p index 531da65..7e47a50 100644 --- a/sdk/recipes/patches/libcurl/ppc-amigaos/lib.setup.h.p +++ b/sdk/recipes/patches/libcurl/ppc-amigaos/lib.curl_setup.h.p @@ -1,6 +1,6 @@ ---- lib/setup.h.old 2012-10-19 21:58:12.000000000 +0100 -+++ lib/setup.h 2012-10-19 21:59:17.000000000 +0100 -@@ -312,11 +312,15 @@ +--- lib/curl_setup.h.old 2012-10-19 21:58:12.000000000 +0100 ++++ lib/curl_setup.h 2012-10-19 21:59:17.000000000 +0100 +@@ -323,11 +323,15 @@ #ifdef __AMIGA__ # ifndef __ixemul__ 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 9fa620c..3f521af 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.old 2012-10-19 21:42:57.000000000 +0100 +++ src/tool_operate.c 2012-10-19 21:43:27.000000000 +0100 -@@ -1598,15 +1598,6 @@ +@@ -1731,15 +1731,6 @@ } } |