Simplify patch per upstream request.

4 files changed, 19 insertions, 47 deletions

diff --git a/emulators/mame/distinfo b/emulators/mame/distinfo
index ff6dccc1683..12e9769bda3 100644
--- a/emulators/mame/distinfo
+++ b/emulators/mame/distinfo
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.5 2011/04/04 12:09:03 wiz Exp $
+$NetBSD: distinfo,v 1.6 2011/04/21 20:42:44 wiz Exp $
 
 SHA1 (mame0142s.zip) = 6d70b7a2a15abfdb7955772844ac4c6eae50ced4
 RMD160 (mame0142s.zip) = 20b7fc0af868521462e8081021acbfbe98bea16d
 Size (mame0142s.zip) = 17657289 bytes
 SHA1 (patch-makefile) = 7117269c9818a1bf018c7d650a5fd64fc0ea3728
-SHA1 (patch-src_emu_hash.c) = c2cf2d70c97c2f88538e974f962f53a0eb2647cc
-SHA1 (patch-src_emu_input.c) = 2a7b5a607e2def30f501ea6ef25616ab0ab5aee3
-SHA1 (patch-src_lib_util_astring.h) = 31612dcae07ada558afb7727395d67b0a1388eb5
+SHA1 (patch-src_lib_util_astring.h) = 103db1d57f11f2df65eccd6957c551003e55a137
 SHA1 (patch-src_mame_machine_naomibd.c) = 7bc53bd57a6d75eae4e0d1d27b1b8cb7fd2fb4df
diff --git a/emulators/mame/patches/patch-src_emu_hash.c b/emulators/mame/patches/patch-src_emu_hash.c
deleted file mode 100644
index 78e1e7580ce..00000000000
--- a/emulators/mame/patches/patch-src_emu_hash.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_emu_hash.c,v 1.1 2011/04/04 12:09:03 wiz Exp $
-
-toupper is a macro on NetBSD.
-Sent upstream.
-
---- src/emu/hash.c.orig	2011-03-29 09:38:54.000000000 +0000
-+++ src/emu/hash.c
-@@ -658,7 +658,7 @@ const char *hash_collection::macro_strin
- 	buffer.reset();
- 	for (hash_base *hash = m_hashlist.first(); hash != NULL; hash = hash->next())
- 	{
--		buffer.cat(temp.cpy(hash->name()).toupper());
-+		buffer.cat(temp.cpy(hash->name()).upper());
- 		buffer.cat("(").cat(hash->string(temp)).cat(") ");
- 	}
- 
diff --git a/emulators/mame/patches/patch-src_emu_input.c b/emulators/mame/patches/patch-src_emu_input.c
deleted file mode 100644
index 0cd42fd5204..00000000000
--- a/emulators/mame/patches/patch-src_emu_input.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_emu_input.c,v 1.1 2011/04/04 12:09:03 wiz Exp $
-
-toupper is a macro on NetBSD.
-Sent upstream.
-
---- src/emu/input.c.orig	2011-03-29 08:50:06.000000000 +0000
-+++ src/emu/input.c
-@@ -829,7 +829,7 @@ void input_device_item_add(input_device 
- 	if (itemid > ITEM_ID_MAXIMUM)
- 	{
- 		/* copy the item name, removing spaces/underscores and making all caps */
--		item->token.cpy(name).toupper().delchr(' ').delchr('_');
-+		item->token.cpy(name).upper().delchr(' ').delchr('_');
- 	}
- 
- 	/* otherwise, make sure we have a valid standard token */
diff --git a/emulators/mame/patches/patch-src_lib_util_astring.h b/emulators/mame/patches/patch-src_lib_util_astring.h
index 3975714445d..cc94f20d3a0 100644
--- a/emulators/mame/patches/patch-src_lib_util_astring.h
+++ b/emulators/mame/patches/patch-src_lib_util_astring.h
@@ -1,16 +1,22 @@
-$NetBSD: patch-src_lib_util_astring.h,v 1.5 2011/04/04 12:09:03 wiz Exp $
+$NetBSD: patch-src_lib_util_astring.h,v 1.6 2011/04/21 20:42:44 wiz Exp $
 
-toupper is a macro on NetBSD.
-Sent upstream.
+To avoid confusion with the ctype macros of the same name.
 
 --- src/lib/util/astring.h.orig	2011-02-01 20:29:56.000000000 +0000
 +++ src/lib/util/astring.h
-@@ -396,7 +396,7 @@ public:
+@@ -43,8 +43,15 @@
+ #define __ASTRING_H__
  
- 	astring &delchr(int ch) { return *astring_delchr(this, ch); }
- 	astring &replacechr(int ch, int newch) { return *astring_replacechr(this, ch, newch); }
--	astring &toupper() { return *astring_toupper(this); }
-+	astring &upper() { return *astring_toupper(this); }
- 	astring &tolower() { return *astring_tolower(this); }
- 	astring &trimspace() { return *astring_trimspace(this); }
- };
+ #include <stdarg.h>
++#include <ctype.h>
+ #include "osdcomm.h"
+ 
++#ifdef toupper
++#undef toupper
++#endif
++#ifdef tolower
++#undef tolower
++#endif
+ 
+ /***************************************************************************
+     TYPE DEFINITIONS