Don't redefine realloc before including system headers that might use

it. Make a few more warnings non-fatal for clang.

5 files changed, 44 insertions, 4 deletions

diff --git a/emulators/mame/Makefile.common b/emulators/mame/Makefile.common
index b75d596dfdc..3847f06a2c1 100644
--- a/emulators/mame/Makefile.common
+++ b/emulators/mame/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.11 2013/06/27 15:49:07 joerg Exp $
+# $NetBSD: Makefile.common,v 1.12 2013/10/10 00:06:19 joerg Exp $
 #
 # used by emulators/mame/Makefile
 # used by emulators/mess/Makefile
@@ -40,7 +40,9 @@ _WRAP_EXTRA_ARGS.CC+=	-Wno-error=cast-align \
 			-Wno-error=unused-private-field \
 			-Wno-error=tautological-constant-out-of-range-compare \
 			-Wno-error=tautological-compare \
-			-Wno-error=self-assign-field
+			-Wno-error=self-assign-field \
+			-Wno-error=unused-const-variable \
+			-Wno-error=unused-function
 MAKE_ENV+=		OPTIMIZE=2
 .endif
 
diff --git a/emulators/mame/distinfo b/emulators/mame/distinfo
index 2de1e67d8f2..b65a785bef6 100644
--- a/emulators/mame/distinfo
+++ b/emulators/mame/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.14 2013/09/30 20:03:33 wiz Exp $
+$NetBSD: distinfo,v 1.15 2013/10/10 00:06:19 joerg Exp $
 
 SHA1 (mame0150s.zip) = 14e20123817384f6caf5b7c155be60a745aa4438
 RMD160 (mame0150s.zip) = 102147aa275cba2f8466717adfbaff9758fe5d60
 Size (mame0150s.zip) = 35999158 bytes
+SHA1 (patch-src_emu_webengine.c) = cf8e061a3f7d031ad6b064caa01a44d11de65f55
diff --git a/emulators/mame/patches/patch-src_emu_webengine.c b/emulators/mame/patches/patch-src_emu_webengine.c
new file mode 100644
index 00000000000..8f8a84b1a3c
--- /dev/null
+++ b/emulators/mame/patches/patch-src_emu_webengine.c
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_emu_webengine.c,v 1.1 2013/10/10 00:06:19 joerg Exp $
+
+--- src/emu/webengine.c.orig	2013-10-09 11:04:31.000000000 +0000
++++ src/emu/webengine.c
+@@ -37,12 +37,12 @@
+ 
+ ***************************************************************************/
+ 
++#include "web/json/json.h"
+ #include "emu.h"
+ #include "emuopts.h"
+ #include "ui.h"
+ #include "webengine.h"
+ #include "web/mongoose.h"
+-#include "web/json/json.h"
+ 
+ //**************************************************************************
+ //  WEB ENGINE
diff --git a/emulators/mess/distinfo b/emulators/mess/distinfo
index f327d42c111..da92d905a3b 100644
--- a/emulators/mess/distinfo
+++ b/emulators/mess/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.13 2013/09/30 20:03:33 wiz Exp $
+$NetBSD: distinfo,v 1.14 2013/10/10 00:06:19 joerg Exp $
 
 SHA1 (mame0150s.zip) = 14e20123817384f6caf5b7c155be60a745aa4438
 RMD160 (mame0150s.zip) = 102147aa275cba2f8466717adfbaff9758fe5d60
 Size (mame0150s.zip) = 35999158 bytes
+SHA1 (patch-src_emu_webengine.c) = cf8e061a3f7d031ad6b064caa01a44d11de65f55
diff --git a/emulators/mess/patches/patch-src_emu_webengine.c b/emulators/mess/patches/patch-src_emu_webengine.c
new file mode 100644
index 00000000000..8f8a84b1a3c
--- /dev/null
+++ b/emulators/mess/patches/patch-src_emu_webengine.c
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_emu_webengine.c,v 1.1 2013/10/10 00:06:19 joerg Exp $
+
+--- src/emu/webengine.c.orig	2013-10-09 11:04:31.000000000 +0000
++++ src/emu/webengine.c
+@@ -37,12 +37,12 @@
+ 
+ ***************************************************************************/
+ 
++#include "web/json/json.h"
+ #include "emu.h"
+ #include "emuopts.h"
+ #include "ui.h"
+ #include "webengine.h"
+ #include "web/mongoose.h"
+-#include "web/json/json.h"
+ 
+ //**************************************************************************
+ //  WEB ENGINE