Fix build with modern GCC

7 files changed, 82 insertions, 1 deletions

diff --git a/games/criticalmass/distinfo b/games/criticalmass/distinfo
index 7dd9146f65d..3def2019601 100644
--- a/games/criticalmass/distinfo
+++ b/games/criticalmass/distinfo
@@ -1,8 +1,14 @@
-$NetBSD: distinfo,v 1.9 2011/06/20 09:30:03 wiz Exp $
+$NetBSD: distinfo,v 1.10 2011/11/24 14:09:47 joerg Exp $
 
 SHA1 (CriticalMass-1.0.2.tar.bz2) = d2d1f35183e9fbed76fd8da2a948745a4c89f20b
 RMD160 (CriticalMass-1.0.2.tar.bz2) = 6c0b6988f6a52c4b19fbca2525b1daec0202693d
 Size (CriticalMass-1.0.2.tar.bz2) = 5122126 bytes
 SHA1 (patch-aa) = a5caa2facea22cd5e7d208540626ed2163d81f18
 SHA1 (patch-game_main.cpp) = 9dbf9b3de9de4ce97b0ed99ab4f4c983159124c0
+SHA1 (patch-tinyxml_tinyxml.cpp) = e25526fff0121795c1a54089b87ede52eb86f124
+SHA1 (patch-tinyxml_tinyxmlparser.cpp) = 236ff1cbd6fe83045df28022a6b02f9f65da4ee8
+SHA1 (patch-utils_ResourceManager.cpp) = a491869a5b6a99e281bb5de88c7c86ad5996fa00
+SHA1 (patch-utils_Value.hpp) = e5b6700167a6fc3dd1275cda4b17cab85d68d22d
+SHA1 (patch-utils_zStream.cpp) = b94b48862bbcfbdfbe84d7d1e6bf8133921d80aa
+SHA1 (patch-utils_zStreamBufferImplZLib.cpp) = ad7a4bc3d6a36274d2a71e0d6201b20461274b89
 SHA1 (patch-utilssdl_PNG.cpp) = bf46226338a75c50c25f273f8b6cd956eb7d656c
diff --git a/games/criticalmass/patches/patch-tinyxml_tinyxml.cpp b/games/criticalmass/patches/patch-tinyxml_tinyxml.cpp
new file mode 100644
index 00000000000..a10762ad75a
--- /dev/null
+++ b/games/criticalmass/patches/patch-tinyxml_tinyxml.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-tinyxml_tinyxml.cpp,v 1.1 2011/11/24 14:09:47 joerg Exp $
+
+--- tinyxml/tinyxml.cpp.orig	2011-11-24 00:44:05.000000000 +0000
++++ tinyxml/tinyxml.cpp
+@@ -22,6 +22,8 @@ distribution.

+ */

+ 

+ #include "tinyxml.h"

++#include <stdlib.h>
++#include <string.h>
+ 

+ 

+ TiXmlNode::TiXmlNode( NodeType _type )

diff --git a/games/criticalmass/patches/patch-tinyxml_tinyxmlparser.cpp b/games/criticalmass/patches/patch-tinyxml_tinyxmlparser.cpp
new file mode 100644
index 00000000000..ff906456bcb
--- /dev/null
+++ b/games/criticalmass/patches/patch-tinyxml_tinyxmlparser.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-tinyxml_tinyxmlparser.cpp,v 1.1 2011/11/24 14:09:47 joerg Exp $
+
+--- tinyxml/tinyxmlparser.cpp.orig	2011-11-24 00:44:44.000000000 +0000
++++ tinyxml/tinyxmlparser.cpp
+@@ -24,6 +24,7 @@ distribution.

+ 

+ #include "tinyxml.h"

+ #include <ctype.h>

++#include <string.h>
+ 

+ const char* TiXmlBase::SkipWhiteSpace( const char* p )

+ {

diff --git a/games/criticalmass/patches/patch-utils_ResourceManager.cpp b/games/criticalmass/patches/patch-utils_ResourceManager.cpp
new file mode 100644
index 00000000000..88504569c60
--- /dev/null
+++ b/games/criticalmass/patches/patch-utils_ResourceManager.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-utils_ResourceManager.cpp,v 1.1 2011/11/24 14:09:47 joerg Exp $
+
+--- utils/ResourceManager.cpp.orig	2011-11-24 00:45:09.000000000 +0000
++++ utils/ResourceManager.cpp
+@@ -15,6 +15,7 @@
+ #include <iomanip>
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <string.h>
+ 
+ #include <Trace.hpp>
+ #include <ResourceManager.hpp>
diff --git a/games/criticalmass/patches/patch-utils_Value.hpp b/games/criticalmass/patches/patch-utils_Value.hpp
new file mode 100644
index 00000000000..08507621b48
--- /dev/null
+++ b/games/criticalmass/patches/patch-utils_Value.hpp
@@ -0,0 +1,14 @@
+$NetBSD: patch-utils_Value.hpp,v 1.1 2011/11/24 14:09:47 joerg Exp $
+
+--- utils/Value.hpp.orig	2011-11-24 00:45:29.000000000 +0000
++++ utils/Value.hpp
+@@ -15,7 +15,9 @@
+ #ifndef _Value_hpp_
+ #define _Value_hpp_
+ 
++#include <stdlib.h>
+ #include <stdio.h>
++#include <string.h>
+ #include <string>
+ 
+ #include <Trace.hpp>
diff --git a/games/criticalmass/patches/patch-utils_zStream.cpp b/games/criticalmass/patches/patch-utils_zStream.cpp
new file mode 100644
index 00000000000..83b416a594d
--- /dev/null
+++ b/games/criticalmass/patches/patch-utils_zStream.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-utils_zStream.cpp,v 1.1 2011/11/24 14:09:47 joerg Exp $
+
+--- utils/zStream.cpp.orig	2011-11-24 00:46:06.000000000 +0000
++++ utils/zStream.cpp
+@@ -12,6 +12,7 @@
+ // ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ // FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details
+ //
++#include <stdlib.h>
+ #include <Trace.hpp>
+ #include <Endian.hpp>
+ #include <zStream.hpp>
diff --git a/games/criticalmass/patches/patch-utils_zStreamBufferImplZLib.cpp b/games/criticalmass/patches/patch-utils_zStreamBufferImplZLib.cpp
new file mode 100644
index 00000000000..56f45b7baa7
--- /dev/null
+++ b/games/criticalmass/patches/patch-utils_zStreamBufferImplZLib.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-utils_zStreamBufferImplZLib.cpp,v 1.1 2011/11/24 14:09:47 joerg Exp $
+
+--- utils/zStreamBufferImplZLib.cpp.orig	2011-11-24 00:46:30.000000000 +0000
++++ utils/zStreamBufferImplZLib.cpp
+@@ -14,6 +14,7 @@
+ //
+ #include <Trace.hpp>
+ #include <zStreamBufferImplZLib.hpp>
++#include <stdlib.h>
+ 
+ bool ziStreamBufferImplZLib::init( void)
+ {