From 91eb92a4236997cefd4fcaf78409a5f70f14fe03 Mon Sep 17 00:00:00 2001
From: Vincent Sanders <vince@netsurf-browser.org>
Date: Sun, 22 Jul 2012 23:08:58 +0100
Subject: fix mingw build

---
 sdk/recipes/patches/libcurl/lib.easy.c.p           | 27 ----------------------
 .../patches/libcurl/ppc-amigaos/lib.easy.c.p       | 27 ++++++++++++++++++++++
 .../patches/libcurl/ppc-amigaos/src.main.c.p       | 18 +++++++++++++++
 sdk/recipes/patches/libcurl/src.main.c.p           | 18 ---------------
 4 files changed, 45 insertions(+), 45 deletions(-)
 delete mode 100644 sdk/recipes/patches/libcurl/lib.easy.c.p
 create mode 100644 sdk/recipes/patches/libcurl/ppc-amigaos/lib.easy.c.p
 create mode 100644 sdk/recipes/patches/libcurl/ppc-amigaos/src.main.c.p
 delete mode 100644 sdk/recipes/patches/libcurl/src.main.c.p

(limited to 'sdk/recipes/patches')

diff --git a/sdk/recipes/patches/libcurl/lib.easy.c.p b/sdk/recipes/patches/libcurl/lib.easy.c.p
deleted file mode 100644
index c98b845..0000000
--- a/sdk/recipes/patches/libcurl/lib.easy.c.p
+++ /dev/null
@@ -1,27 +0,0 @@
---- lib/easy.c.old	2010-12-29 16:14:23.000000000 +0000
-+++ lib/easy.c	2010-12-29 16:15:10.000000000 +0000
-@@ -263,13 +263,6 @@
-       return CURLE_FAILED_INIT;
-     }
- 
--#ifdef __AMIGA__
--  if(!amiga_init()) {
--    DEBUGF(fprintf(stderr, "Error: amiga_init failed\n"));
--    return CURLE_FAILED_INIT;
--  }
--#endif
--
- #ifdef NETWARE
-   if(netware_init()) {
-     DEBUGF(fprintf(stderr, "Warning: LONG namespace not available\n"));
-@@ -358,10 +351,6 @@
-   if(init_flags & CURL_GLOBAL_WIN32)
-     win32_cleanup();
- 
--#ifdef __AMIGA__
--  amiga_cleanup();
--#endif
--
- #if defined(USE_LIBSSH2) && defined(HAVE_LIBSSH2_EXIT)
-   (void)libssh2_exit();
- #endif
diff --git a/sdk/recipes/patches/libcurl/ppc-amigaos/lib.easy.c.p b/sdk/recipes/patches/libcurl/ppc-amigaos/lib.easy.c.p
new file mode 100644
index 0000000..c98b845
--- /dev/null
+++ b/sdk/recipes/patches/libcurl/ppc-amigaos/lib.easy.c.p
@@ -0,0 +1,27 @@
+--- lib/easy.c.old	2010-12-29 16:14:23.000000000 +0000
++++ lib/easy.c	2010-12-29 16:15:10.000000000 +0000
+@@ -263,13 +263,6 @@
+       return CURLE_FAILED_INIT;
+     }
+ 
+-#ifdef __AMIGA__
+-  if(!amiga_init()) {
+-    DEBUGF(fprintf(stderr, "Error: amiga_init failed\n"));
+-    return CURLE_FAILED_INIT;
+-  }
+-#endif
+-
+ #ifdef NETWARE
+   if(netware_init()) {
+     DEBUGF(fprintf(stderr, "Warning: LONG namespace not available\n"));
+@@ -358,10 +351,6 @@
+   if(init_flags & CURL_GLOBAL_WIN32)
+     win32_cleanup();
+ 
+-#ifdef __AMIGA__
+-  amiga_cleanup();
+-#endif
+-
+ #if defined(USE_LIBSSH2) && defined(HAVE_LIBSSH2_EXIT)
+   (void)libssh2_exit();
+ #endif
diff --git a/sdk/recipes/patches/libcurl/ppc-amigaos/src.main.c.p b/sdk/recipes/patches/libcurl/ppc-amigaos/src.main.c.p
new file mode 100644
index 0000000..846e19c
--- /dev/null
+++ b/sdk/recipes/patches/libcurl/ppc-amigaos/src.main.c.p
@@ -0,0 +1,18 @@
+--- src/main.c.old	2010-12-29 16:18:04.000000000 +0000
++++ src/main.c	2010-12-29 16:17:51.000000000 +0000
+@@ -64,6 +64,15 @@
+ #endif
+ #endif
+ 
++#ifdef __AMIGA__
++ #ifdef __amigaos4__
++  #ifndef __USE_INLINE__
++   #define __USE_INLINE__
++  #endif
++ #endif
++#include <proto/dos.h>
++#endif
++
+ #include "version.h"
+ 
+ #ifdef HAVE_IO_H /* typical win32 habit */
diff --git a/sdk/recipes/patches/libcurl/src.main.c.p b/sdk/recipes/patches/libcurl/src.main.c.p
deleted file mode 100644
index 846e19c..0000000
--- a/sdk/recipes/patches/libcurl/src.main.c.p
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/main.c.old	2010-12-29 16:18:04.000000000 +0000
-+++ src/main.c	2010-12-29 16:17:51.000000000 +0000
-@@ -64,6 +64,15 @@
- #endif
- #endif
- 
-+#ifdef __AMIGA__
-+ #ifdef __amigaos4__
-+  #ifndef __USE_INLINE__
-+   #define __USE_INLINE__
-+  #endif
-+ #endif
-+#include <proto/dos.h>
-+#endif
-+
- #include "version.h"
- 
- #ifdef HAVE_IO_H /* typical win32 habit */
-- 
cgit v1.2.3