6 files changed, 56 insertions, 4 deletions
diff --git a/sdk/Makefile b/sdk/Makefile
index a13eb65..25bec2f 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -98,7 +98,7 @@ ifeq ($(TARGET),m68k-atari-mint)
   EXTRAARGS_LIBXML := --enable-ipv6=no
   SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, libiconv.d $(COMMON_SDK_ITEMS) libcf.d ldg.d windom.d hermes.d freetype.d)
   EXTRAARGS_LIBCARES := --disable-shared
-  EXTRAARGS_LIBCURL := --enable-optimize --enable-nonblocking --enable-ares --with-random="/dev/urandom" --disable-manual --disable-curldebug --disable-thread --disable-threaded-resolver 
+  EXTRAARGS_LIBCURL := --enable-optimize --enable-nonblocking --enable-ares --with-random="/dev/urandom" --disable-manual --disable-curldebug --disable-thread --disable-threaded-resolver curl_disallow_poll="yes"
   EXTRAARGS_LIBICONV := --enable-extra-encodings
 endif
 
@@ -106,7 +106,7 @@ ifeq ($(TARGET),m5475-atari-mint)
   EXTRAARGS_LIBXML := --enable-ipv6=no
   SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, libiconv.d $(COMMON_SDK_ITEMS) libcf.d ldg.d windom.d hermes.d freetype.d)
   EXTRAARGS_LIBCARES := --disable-shared
-  EXTRAARGS_LIBCURL := --enable-optimize --enable-nonblocking --enable-ares --with-random="/dev/urandom" --disable-manual --disable-curldebug --disable-thread --disable-threaded-resolver
+  EXTRAARGS_LIBCURL := --enable-optimize --enable-nonblocking --enable-ares --with-random="/dev/urandom" --disable-manual --disable-curldebug --disable-thread --disable-threaded-resolver curl_disallow_poll="yes"
   EXTRAARGS_LIBICONV := --enable-extra-encodings
 endif
 
diff --git a/sdk/recipes/patches/hermes/src.Dither.h.p b/sdk/recipes/patches/hermes/src.Dither.h.p
new file mode 100644
index 0000000..c240f07
--- /dev/null
+++ b/sdk/recipes/patches/hermes/src.Dither.h.p
@@ -0,0 +1,11 @@
+--- src/Dither.h.orig	2013-10-07 23:00:38.000000000 +0200
++++ src/Dither.h	2013-10-07 21:53:56.000000000 +0200
+@@ -20,7 +20,7 @@
+ extern char8 DitherTab_b332_44[4][4][256];
+ 
+ 
+-void Dither_SetupMatrices();
++void Dither_SetupMatrices(void);
+ 
+ 
+ 
diff --git a/sdk/recipes/patches/hermes/src.Factory.c.p b/sdk/recipes/patches/hermes/src.Factory.c.p
new file mode 100644
index 0000000..aea516a
--- /dev/null
+++ b/sdk/recipes/patches/hermes/src.Factory.c.p
@@ -0,0 +1,19 @@
+--- src/Factory.c.orig	2013-10-07 23:01:32.000000000 +0200
++++ src/Factory.c	2013-10-07 21:54:56.000000000 +0200
+@@ -21,12 +21,13 @@
+ 
+ 
+ /* disable visual c++ warning */
+-#if (_MSC_VER>=1000)
+-#pragma warning( disable : 4113 )
++#if defined(_MSC_VER)
++# if (_MSC_VER>=1000)
++#  pragma warning( disable : 4113 )
++# endif
+ #endif
+ 
+ 
+-
+ int processor;
+ 
+ 
diff --git a/sdk/recipes/patches/hermes/src.Factory.h.p b/sdk/recipes/patches/hermes/src.Factory.h.p
new file mode 100644
index 0000000..83923c1
--- /dev/null
+++ b/sdk/recipes/patches/hermes/src.Factory.h.p
@@ -0,0 +1,11 @@
+--- src/Factory.h.orig	2013-10-07 22:59:46.000000000 +0200
++++ src/Factory.h	2013-10-07 21:53:01.000000000 +0200
+@@ -17,7 +17,7 @@
+ 
+ 
+ /* Initialise factory */
+-void Hermes_Factory_Init();
++void Hermes_Factory_Init(void);
+ 
+ 
+ /* Get a clearer function for bits / pixel */
diff --git a/sdk/recipes/patches/hermes/src.Hermes.h.p b/sdk/recipes/patches/hermes/src.Hermes.h.p
index 19de6ec..fd969fd 100644
--- a/sdk/recipes/patches/hermes/src.Hermes.h.p
+++ b/sdk/recipes/patches/hermes/src.Hermes.h.p
@@ -1,5 +1,5 @@
---- src/Hermes.h.orig	2012-11-07 23:02:36.000000000 +0100
-+++ src/Hermes.h	2012-11-07 23:05:47.000000000 +0100
+--- src/Hermes.h.orig	2013-10-07 22:55:59.000000000 +0200
++++ src/Hermes.h	2013-10-07 21:41:20.000000000 +0200
 @@ -17,11 +17,11 @@
  #include "H_Config.h"
  
diff --git a/sdk/recipes/patches/hermes/src.List.h.p b/sdk/recipes/patches/hermes/src.List.h.p
new file mode 100644
index 0000000..4b73190
--- /dev/null
+++ b/sdk/recipes/patches/hermes/src.List.h.p
@@ -0,0 +1,11 @@
+--- src/List.h.orig	2013-10-07 22:58:00.000000000 +0200
++++ src/List.h	2013-10-07 21:52:30.000000000 +0200
+@@ -30,7 +30,7 @@
+ 
+ 
+ /* Create a new linked list. Returns 0 if failed */
+-HermesList *Hermes_ListNew();
++HermesList *Hermes_ListNew(void);
+ 
+ 
+ /* Destroy the list pointed to by list */