From: Santiago Vila <sanvila@debian.org>
Subject: This is just the old .diff.gz converted to quilt style patch

--- a/game/CallbackManager.cpp
+++ b/game/CallbackManager.cpp
@@ -27,7 +27,7 @@
 {
     XTRACE();
 
-    hash_map< string, Callback*, hash<string> >::const_iterator ci;
+    __gnu_cxx::hash_map< string, Callback*, __gnu_cxx::hash<string> >::const_iterator ci;
     for( ci=_actionMap.begin(); ci!=_actionMap.end(); ci++)
     {
         delete ci->second;
--- a/game/Input.cpp
+++ b/game/Input.cpp
@@ -260,7 +260,7 @@
     XTRACE();
     outfile << "# --- Binding section --- " << endl;
 
-    hash_map< Trigger, Callback*, hash<Trigger> >::const_iterator ci;
+    __gnu_cxx::hash_map< Trigger, Callback*, __gnu_cxx::hash<Trigger> >::const_iterator ci;
     for( ci=_callbackMap.begin(); ci!=_callbackMap.end(); ci++)
     {
         outfile << "bind " 
--- a/game/ModelManager.cpp
+++ b/game/ModelManager.cpp
@@ -26,7 +26,7 @@
 {
     XTRACE();
 
-    hash_map< string, Model*, hash<string> >::const_iterator ci;
+    __gnu_cxx::hash_map< string, Model*, __gnu_cxx::hash<string> >::const_iterator ci;
     for( ci=_modelMap.begin(); ci!=_modelMap.end(); ci++)
     {
         delete ci->second;
@@ -39,7 +39,7 @@
 {
     XTRACE();
 
-    hash_map< string, Model*, hash<string> >::const_iterator ci;
+    __gnu_cxx::hash_map< string, Model*, __gnu_cxx::hash<string> >::const_iterator ci;
     for( ci=_modelMap.begin(); ci!=_modelMap.end(); ci++)
     {
         ci->second->reload();
--- a/game/ParticleGroup.hpp
+++ b/game/ParticleGroup.hpp
@@ -86,7 +86,7 @@
 
     static void destroyParticleTypes( void)
     {
-	hash_map< const string, ParticleType*, hash<const string> >::const_iterator ci;
+	__gnu_cxx::hash_map< const string, ParticleType*, __gnu_cxx::hash<const string> >::const_iterator ci;
 	for( ci=_particleTypeMap.begin(); ci!=_particleTypeMap.end(); ci++)
 	{
 	    //don't delete hero!
--- a/game/SelectableFactory.cpp
+++ b/game/SelectableFactory.cpp
@@ -42,9 +42,9 @@
 
 void SelectableFactory::cleanup( void)
 {
-    hash_map< const string, 
+    __gnu_cxx::hash_map< const string, 
               SelectableFactory*, 
-	      hash<const string> >::const_iterator ci;
+	      __gnu_cxx::hash<const string> >::const_iterator ci;
     for( ci=_sfMap.begin(); ci!=_sfMap.end(); ci++)
     {
 	SelectableFactory *sf = ci->second;
--- a/game/WeaponDepot.cpp
+++ b/game/WeaponDepot.cpp
@@ -32,7 +32,7 @@
 {
     XTRACE();
 
-    hash_map< string, Weapon*, hash<string> >::const_iterator ci;
+    __gnu_cxx::hash_map< string, Weapon*, __gnu_cxx::hash<string> >::const_iterator ci;
     for( ci=_weaponMap.begin(); ci!=_weaponMap.end(); ci++)
     {
         delete ci->second;
--- a/tinyxml/tinyxml.cpp
+++ b/tinyxml/tinyxml.cpp
@@ -23,6 +23,8 @@
 
 #include "tinyxml.h"
 
+#include <cstring>
+
 
 TiXmlNode::TiXmlNode( NodeType _type )
 {
--- a/tinyxml/tinyxml.h
+++ b/tinyxml/tinyxml.h
@@ -30,6 +30,7 @@
 #pragma warning( disable : 4786 )
 #endif
 
+#include <cstdlib>
 #include <string>
 #include <stdio.h>
 #include <assert.h>
--- a/tinyxml/tinyxmlparser.cpp
+++ b/tinyxml/tinyxmlparser.cpp
@@ -25,6 +25,8 @@
 #include "tinyxml.h"
 #include <ctype.h>
 
+#include <cstring>
+
 const char* TiXmlBase::SkipWhiteSpace( const char* p )
 {
 	while ( p && *p && 
--- a/utils/FindHash.hpp
+++ b/utils/FindHash.hpp
@@ -30,6 +30,7 @@
     return ci->second;
 }
 
+#if 0
 template< class _KeyT, class _ValT >
 _ValT* findHash( 
     const _KeyT &trigger, 
@@ -44,5 +45,6 @@
 
     return ci->second;
 }
+#endif
 
 #endif
--- a/utils/ResourceManager.cpp
+++ b/utils/ResourceManager.cpp
@@ -22,6 +22,8 @@
 #include <Endian.hpp>
 #include <WalkDirectory.hpp>
 
+#include <cstring>
+
 #ifdef WIN32
 const char PATH_SEPERATOR = '\\';
 #else
--- a/utils/Value.hpp
+++ b/utils/Value.hpp
@@ -15,6 +15,7 @@
 #ifndef _Value_hpp_
 #define _Value_hpp_
 
+#include <cstdlib>
 #include <stdio.h>
 #include <string>
 
--- a/utils/zStream.cpp
+++ b/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 <cstdlib>
 #include <Trace.hpp>
 #include <Endian.hpp>
 #include <zStream.hpp>
--- a/utils/zStreamBufferImplZLib.cpp
+++ b/utils/zStreamBufferImplZLib.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 <cstdlib>
 #include <Trace.hpp>
 #include <zStreamBufferImplZLib.hpp>
 
