From 28c51e3a0eb97efb1394c1211099a9e4013e73a9 Mon Sep 17 00:00:00 2001
From: rillig <rillig>
Date: Wed, 10 Oct 2007 11:29:19 +0000
Subject: Fixed "extra qualification" errors.

---
 emulators/vmips/distinfo         |  4 +++-
 emulators/vmips/patches/patch-aa | 13 +++++++++++++
 emulators/vmips/patches/patch-ab | 13 +++++++++++++
 3 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 emulators/vmips/patches/patch-aa
 create mode 100644 emulators/vmips/patches/patch-ab

(limited to 'emulators')

diff --git a/emulators/vmips/distinfo b/emulators/vmips/distinfo
index 1ba84881416..0357d7a804d 100644
--- a/emulators/vmips/distinfo
+++ b/emulators/vmips/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/11/20 13:30:03 rillig Exp $
+$NetBSD: distinfo,v 1.2 2007/10/10 11:29:19 rillig Exp $
 
 SHA1 (vmips-1.3.1.tar.gz) = 0ca5d942db5ceaabe18aae831e80df59be8e16d9
 RMD160 (vmips-1.3.1.tar.gz) = cfc831072cac4295e26fc57d8ed892d56f32c81a
 Size (vmips-1.3.1.tar.gz) = 1144409 bytes
+SHA1 (patch-aa) = c8ba30db8a11adfd3848771e8eea5bdb0821b767
+SHA1 (patch-ab) = 3cc0b6f7a02f06cfbf9d70a1b26944b89f834c56
diff --git a/emulators/vmips/patches/patch-aa b/emulators/vmips/patches/patch-aa
new file mode 100644
index 00000000000..82528a9fe38
--- /dev/null
+++ b/emulators/vmips/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2007/10/10 11:29:19 rillig Exp $
+
+--- deviceint.h.orig	2005-01-06 22:04:54.000000000 +0100
++++ deviceint.h	2007-10-10 13:27:57.000000000 +0200
+@@ -52,7 +52,7 @@ public:
+ 
+ 	/* Return the bit of the CP0 Status and Cause registers corresponding
+ 	   to interrupt line number NUM, or 0 if no such interrupt line exists. */
+-	static uint32 DeviceInt::num2irq(uint32 num) throw();
++	static uint32 num2irq(uint32 num) throw();
+ 
+ protected:
+ 	/* Assert an interrupt request on interrupt line LINE, which
diff --git a/emulators/vmips/patches/patch-ab b/emulators/vmips/patches/patch-ab
new file mode 100644
index 00000000000..a71e1bdff9c
--- /dev/null
+++ b/emulators/vmips/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2007/10/10 11:29:20 rillig Exp $
+
+--- vmips.h.orig	2005-01-06 22:04:54.000000000 +0100
++++ vmips.h	2007-10-10 13:27:20.000000000 +0200
+@@ -145,7 +145,7 @@ protected:
+ 		TerminalController *c, const char *c_name) throw();
+ 
+ 	/* Initialize the halt device if it is configured. */
+-    bool vmips::setup_haltdevice() throw( std::bad_alloc );
++	bool setup_haltdevice() throw( std::bad_alloc );
+ 
+ public:
+ 	void refresh_options(void);
-- 
cgit v1.2.3