Fix build with modern GCC

17 files changed, 210 insertions, 1 deletions

diff --git a/emulators/openmsx/distinfo b/emulators/openmsx/distinfo
index c56996d6203..70365de168f 100644
--- a/emulators/openmsx/distinfo
+++ b/emulators/openmsx/distinfo
@@ -1,7 +1,23 @@
-$NetBSD: distinfo,v 1.7 2011/06/20 09:28:06 wiz Exp $
+$NetBSD: distinfo,v 1.8 2011/11/24 14:12:21 joerg Exp $
 
 SHA1 (openmsx-0.6.2.tar.gz) = b9e2f1bf13f193618f35c0fd6820c2bd44088870
 RMD160 (openmsx-0.6.2.tar.gz) = b800499248ee43de8007042d4dd0a4523f464833
 Size (openmsx-0.6.2.tar.gz) = 1934469 bytes
 SHA1 (patch-aa) = aadad14af76af2dc97dbb3f0ab4b1b5bda4be8c1
+SHA1 (patch-src_commands_Completer.cc) = b5ef6c2d59aef5d927691a638d01512fffc4a44f
+SHA1 (patch-src_events_Socket.cc) = b64d9620bf88a0515612e5a60a87e26442b85752
+SHA1 (patch-src_fdc_TC8566AF.cc) = 418121aff79791fc4b3b8f4062014ebb6529d5ad
+SHA1 (patch-src_file_Date.cc) = 885ae3934fc9ab0d15c99c620a8b94703f3383eb
+SHA1 (patch-src_file_FileBase.cc) = 606ca7ed75dc8ac55e02b1c89e97a39480cb2044
+SHA1 (patch-src_file_GZFileAdapter.cc) = 6b3c691684d7d95a78f9247be0661a4b4b07af36
+SHA1 (patch-src_file_ZipFileAdapter.cc) = 1534647f8c40a44aa80cc41949609f9a855680ce
+SHA1 (patch-src_input_RecordedCommand.hh) = 700ccad99b5b8e23ec54ca5bc0d98081b049d9ee
+SHA1 (patch-src_memory_Ram.cc) = d87340931ad048417fa791c9830b95197593f326
+SHA1 (patch-src_sound_Y8950Adpcm.cc) = 564c0ea4f3783ff6873b45a7bc0b0405f5cc6160
+SHA1 (patch-src_sound_YMF262.cc) = b07afcbe7dd2ced71a7e914283a9580529d8f54e
+SHA1 (patch-src_video_MemoryOps.cc) = 145cf13cbeb8148d0e22eea202c9085a4b501419
 SHA1 (patch-src_video_ScreenShotSaver.cc) = 84175620949c2f781565bdc5e2e864b24afd4549
+SHA1 (patch-src_video_VDP.cc) = 464bb75e38d02dda36b05febf6060f79347f36b0
+SHA1 (patch-src_video_VDPVRAM.cc) = 6fd50b6d977317ca08fe6957d8f91b67381e1a6e
+SHA1 (patch-src_video_v9990_V9990.cc) = 0b6f80332b5c1f64c9812c54f1e4d1864fdde612
+SHA1 (patch-src_video_v9990_V9990VRAM.cc) = 124a0cd55f3d9e763ac8a4775f7dd8859cfe6bbb
diff --git a/emulators/openmsx/patches/patch-src_commands_Completer.cc b/emulators/openmsx/patches/patch-src_commands_Completer.cc
new file mode 100644
index 00000000000..b974d9db868
--- /dev/null
+++ b/emulators/openmsx/patches/patch-src_commands_Completer.cc
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_commands_Completer.cc,v 1.1 2011/11/24 14:12:21 joerg Exp $
+
+--- src/commands/Completer.cc.orig	2011-11-24 02:40:18.000000000 +0000
++++ src/commands/Completer.cc
+@@ -6,6 +6,7 @@
+ #include "FileOperations.hh"
+ #include "ReadDir.hh"
+ #include <algorithm>
++#include <strings.h>
+ 
+ using std::vector;
+ using std::string;
diff --git a/emulators/openmsx/patches/patch-src_events_Socket.cc b/emulators/openmsx/patches/patch-src_events_Socket.cc
new file mode 100644
index 00000000000..2040a6229ef
--- /dev/null
+++ b/emulators/openmsx/patches/patch-src_events_Socket.cc
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_events_Socket.cc,v 1.1 2011/11/24 14:12:21 joerg Exp $
+
+--- src/events/Socket.cc.orig	2011-11-24 02:41:51.000000000 +0000
++++ src/events/Socket.cc
+@@ -3,6 +3,7 @@
+ #include "Socket.hh"
+ #include "MSXException.hh"
+ #include <map>
++#include <string.h>
+ 
+ namespace openmsx {
+ 
diff --git a/emulators/openmsx/patches/patch-src_fdc_TC8566AF.cc b/emulators/openmsx/patches/patch-src_fdc_TC8566AF.cc
new file mode 100644
index 00000000000..092211b3c38
--- /dev/null
+++ b/emulators/openmsx/patches/patch-src_fdc_TC8566AF.cc
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_fdc_TC8566AF.cc,v 1.1 2011/11/24 14:12:21 joerg Exp $
+
+--- src/fdc/TC8566AF.cc.orig	2011-11-24 02:42:35.000000000 +0000
++++ src/fdc/TC8566AF.cc
+@@ -8,6 +8,7 @@
+ #include "TC8566AF.hh"
+ #include "DiskDrive.hh"
+ #include "MSXException.hh"
++#include <string.h>
+ 
+ namespace openmsx {
+ 
diff --git a/emulators/openmsx/patches/patch-src_file_Date.cc b/emulators/openmsx/patches/patch-src_file_Date.cc
new file mode 100644
index 00000000000..b47692bb194
--- /dev/null
+++ b/emulators/openmsx/patches/patch-src_file_Date.cc
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_file_Date.cc,v 1.1 2011/11/24 14:12:21 joerg Exp $
+
+--- src/file/Date.cc.orig	2011-11-24 02:42:56.000000000 +0000
++++ src/file/Date.cc
+@@ -4,6 +4,7 @@
+ #include <sstream>
+ #include <iomanip>
+ #include <cstdio>
++#include <cstring>
+ 
+ namespace openmsx {
+ 
diff --git a/emulators/openmsx/patches/patch-src_file_FileBase.cc b/emulators/openmsx/patches/patch-src_file_FileBase.cc
new file mode 100644
index 00000000000..44884277ed2
--- /dev/null
+++ b/emulators/openmsx/patches/patch-src_file_FileBase.cc
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_file_FileBase.cc,v 1.1 2011/11/24 14:12:21 joerg Exp $
+
+--- src/file/FileBase.cc.orig	2011-11-24 02:43:13.000000000 +0000
++++ src/file/FileBase.cc
+@@ -2,6 +2,7 @@
+ 
+ #include "FileBase.hh"
+ #include <algorithm>
++#include <cstring>
+ 
+ using std::string;
+ 
diff --git a/emulators/openmsx/patches/patch-src_file_GZFileAdapter.cc b/emulators/openmsx/patches/patch-src_file_GZFileAdapter.cc
new file mode 100644
index 00000000000..4952c376eae
--- /dev/null
+++ b/emulators/openmsx/patches/patch-src_file_GZFileAdapter.cc
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_file_GZFileAdapter.cc,v 1.1 2011/11/24 14:12:21 joerg Exp $
+
+--- src/file/GZFileAdapter.cc.orig	2011-11-24 02:43:36.000000000 +0000
++++ src/file/GZFileAdapter.cc
+@@ -3,6 +3,7 @@
+ #include "GZFileAdapter.hh"
+ #include "FileException.hh"
+ #include <cassert>
++#include <cstdlib>
+ #include <zlib.h>
+ 
+ namespace openmsx {
diff --git a/emulators/openmsx/patches/patch-src_file_ZipFileAdapter.cc b/emulators/openmsx/patches/patch-src_file_ZipFileAdapter.cc
new file mode 100644
index 00000000000..2d104766f67
--- /dev/null
+++ b/emulators/openmsx/patches/patch-src_file_ZipFileAdapter.cc
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_file_ZipFileAdapter.cc,v 1.1 2011/11/24 14:12:21 joerg Exp $
+
+--- src/file/ZipFileAdapter.cc.orig	2011-11-24 02:43:55.000000000 +0000
++++ src/file/ZipFileAdapter.cc
+@@ -3,6 +3,7 @@
+ #include <zlib.h>
+ #include "ZipFileAdapter.hh"
+ #include "FileException.hh"
++#include <cstdlib>
+ 
+ namespace openmsx {
+ 
diff --git a/emulators/openmsx/patches/patch-src_input_RecordedCommand.hh b/emulators/openmsx/patches/patch-src_input_RecordedCommand.hh
new file mode 100644
index 00000000000..6c9a66ffbfe
--- /dev/null
+++ b/emulators/openmsx/patches/patch-src_input_RecordedCommand.hh
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_input_RecordedCommand.hh,v 1.1 2011/11/24 14:12:21 joerg Exp $
+
+--- src/input/RecordedCommand.hh.orig	2011-11-24 02:44:43.000000000 +0000
++++ src/input/RecordedCommand.hh
+@@ -6,6 +6,8 @@
+ #include "Command.hh"
+ #include "MSXEventListener.hh"
+ 
++#include <memory>
++
+ namespace openmsx {
+ 
+ class MSXCommandController;
diff --git a/emulators/openmsx/patches/patch-src_memory_Ram.cc b/emulators/openmsx/patches/patch-src_memory_Ram.cc
new file mode 100644
index 00000000000..97d0e333f91
--- /dev/null
+++ b/emulators/openmsx/patches/patch-src_memory_Ram.cc
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_memory_Ram.cc,v 1.1 2011/11/24 14:12:21 joerg Exp $
+
+--- src/memory/Ram.cc.orig	2011-11-24 02:45:09.000000000 +0000
++++ src/memory/Ram.cc
+@@ -2,6 +2,7 @@
+ 
+ #include "Ram.hh"
+ #include "SimpleDebuggable.hh"
++#include <cstring>
+ 
+ namespace openmsx {
+ 
diff --git a/emulators/openmsx/patches/patch-src_sound_Y8950Adpcm.cc b/emulators/openmsx/patches/patch-src_sound_Y8950Adpcm.cc
new file mode 100644
index 00000000000..91b726cb328
--- /dev/null
+++ b/emulators/openmsx/patches/patch-src_sound_Y8950Adpcm.cc
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_sound_Y8950Adpcm.cc,v 1.1 2011/11/24 14:12:21 joerg Exp $
+
+--- src/sound/Y8950Adpcm.cc.orig	2011-11-24 02:46:13.000000000 +0000
++++ src/sound/Y8950Adpcm.cc
+@@ -5,6 +5,7 @@
+ #include "Clock.hh"
+ #include "Ram.hh"
+ #include "MSXMotherBoard.hh"
++#include <cstring>
+ 
+ namespace openmsx {
+ 
diff --git a/emulators/openmsx/patches/patch-src_sound_YMF262.cc b/emulators/openmsx/patches/patch-src_sound_YMF262.cc
new file mode 100644
index 00000000000..7449b1f3929
--- /dev/null
+++ b/emulators/openmsx/patches/patch-src_sound_YMF262.cc
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_sound_YMF262.cc,v 1.1 2011/11/24 14:12:21 joerg Exp $
+
+--- src/sound/YMF262.cc.orig	2011-11-24 02:46:36.000000000 +0000
++++ src/sound/YMF262.cc
+@@ -43,6 +43,7 @@
+ #include "SimpleDebuggable.hh"
+ #include "MSXMotherBoard.hh"
+ #include <cmath>
++#include <cstring>
+ 
+ namespace openmsx {
+ 
diff --git a/emulators/openmsx/patches/patch-src_video_MemoryOps.cc b/emulators/openmsx/patches/patch-src_video_MemoryOps.cc
new file mode 100644
index 00000000000..2b66dba157d
--- /dev/null
+++ b/emulators/openmsx/patches/patch-src_video_MemoryOps.cc
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_video_MemoryOps.cc,v 1.1 2011/11/24 14:12:21 joerg Exp $
+
+--- src/video/MemoryOps.cc.orig	2011-11-24 02:47:07.000000000 +0000
++++ src/video/MemoryOps.cc
+@@ -10,6 +10,7 @@
+ #include <map>
+ #include <cassert>
+ #include <cstdlib>
++#include <cstring>
+ 
+ namespace openmsx {
+ 
diff --git a/emulators/openmsx/patches/patch-src_video_VDP.cc b/emulators/openmsx/patches/patch-src_video_VDP.cc
new file mode 100644
index 00000000000..3785da11e86
--- /dev/null
+++ b/emulators/openmsx/patches/patch-src_video_VDP.cc
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_video_VDP.cc,v 1.1 2011/11/24 14:12:21 joerg Exp $
+
+--- src/video/VDP.cc.orig	2011-11-24 02:47:33.000000000 +0000
++++ src/video/VDP.cc
+@@ -33,6 +33,7 @@ TODO:
+ #include "MSXCliComm.hh"
+ #include <sstream>
+ #include <cassert>
++#include <cstring>
+ 
+ namespace openmsx {
+ 
diff --git a/emulators/openmsx/patches/patch-src_video_VDPVRAM.cc b/emulators/openmsx/patches/patch-src_video_VDPVRAM.cc
new file mode 100644
index 00000000000..8da4e244363
--- /dev/null
+++ b/emulators/openmsx/patches/patch-src_video_VDPVRAM.cc
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_video_VDPVRAM.cc,v 1.1 2011/11/24 14:12:21 joerg Exp $
+
+--- src/video/VDPVRAM.cc.orig	2011-11-24 02:47:51.000000000 +0000
++++ src/video/VDPVRAM.cc
+@@ -4,6 +4,7 @@
+ #include "SpriteChecker.hh"
+ #include "Renderer.hh"
+ #include "Math.hh"
++#include <cstring>
+ 
+ namespace openmsx {
+ 
diff --git a/emulators/openmsx/patches/patch-src_video_v9990_V9990.cc b/emulators/openmsx/patches/patch-src_video_v9990_V9990.cc
new file mode 100644
index 00000000000..7032d464ba7
--- /dev/null
+++ b/emulators/openmsx/patches/patch-src_video_v9990_V9990.cc
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_video_v9990_V9990.cc,v 1.1 2011/11/24 14:12:21 joerg Exp $
+
+--- src/video/v9990/V9990.cc.orig	2011-11-24 02:48:14.000000000 +0000
++++ src/video/v9990/V9990.cc
+@@ -10,6 +10,7 @@
+ #include "SimpleDebuggable.hh"
+ #include "MSXMotherBoard.hh"
+ #include <cassert>
++#include <cstring>
+ 
+ namespace openmsx {
+ 
diff --git a/emulators/openmsx/patches/patch-src_video_v9990_V9990VRAM.cc b/emulators/openmsx/patches/patch-src_video_v9990_V9990VRAM.cc
new file mode 100644
index 00000000000..3b2efa0499d
--- /dev/null
+++ b/emulators/openmsx/patches/patch-src_video_v9990_V9990VRAM.cc
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_video_v9990_V9990VRAM.cc,v 1.1 2011/11/24 14:12:21 joerg Exp $
+
+--- src/video/v9990/V9990VRAM.cc.orig	2011-11-24 02:48:37.000000000 +0000
++++ src/video/v9990/V9990VRAM.cc
+@@ -2,6 +2,7 @@
+ 
+ #include "V9990.hh"
+ #include "V9990VRAM.hh"
++#include <cstring>
+ 
+ namespace openmsx {
+