Fix build with newer GCC


(joerg)

$NetBSD: patch-actions.cc,v 1.1 2011/11/25 21:53:26 joerg Exp $

--- actions.cc.orig	2011-11-25 18:01:36.000000000 +0000
+++ actions.cc
@@ -21,6 +21,8 @@
 #ifdef HAVE_CONFIG_H
 #  include <config.h>
 #endif
+#include <cstring>
+#include <cstdlib>
 
 #include "gamewin.h"
 #include "actions.h"

$NetBSD: patch-args.cc,v 1.1 2011/11/25 21:53:26 joerg Exp $

--- args.cc.orig	2011-11-25 18:02:23.000000000 +0000
+++ args.cc
@@ -24,6 +24,7 @@
 #  include <iostream>
 #endif
 
+#include <cstdlib>
 #include "args.h"
 
 #ifndef UNDER_CE

$NetBSD: patch-audio_xmidi.cc,v 1.1 2011/11/25 21:53:26 joerg Exp $

--- audio/xmidi.cc.orig	2011-11-25 17:44:45.000000000 +0000
+++ audio/xmidi.cc
@@ -26,6 +26,7 @@
 #ifndef ALPHA_LINUX_CXX
 #  include <cassert>
 #  include <cstdio>
+#  include <cstdlib>
 #  include <cmath>
 #  include <iostream>
 #  include <cmath>

$NetBSD: patch-conf_Configuration.cc,v 1.1 2011/11/25 21:53:26 joerg Exp $

--- conf/Configuration.cc.orig	2011-11-25 17:32:44.000000000 +0000
+++ conf/Configuration.cc
@@ -28,6 +28,7 @@
 #ifndef ALPHA_LINUX_CXX
 #  include <cassert>
 #  include <cstdio>
+#  include <cstdlib>
 #endif
 #include <stdio.h>
 #include <iostream>

$NetBSD: patch-conf_xmain.cc,v 1.1 2011/11/25 21:53:26 joerg Exp $

--- conf/xmain.cc.orig	2011-11-25 17:33:59.000000000 +0000
+++ conf/xmain.cc
@@ -27,6 +27,7 @@ Foundation, Inc., 59 Temple Place - Suit
 #include "Configuration.h"
 #include <iostream>
 #include <string>
+#include <cstring>
 #include <cassert>
 #include "common_types.h"
 

$NetBSD: patch-files_Flex.h,v 1.1 2011/11/25 21:53:26 joerg Exp $

--- files/Flex.h.orig	2011-11-25 17:26:18.000000000 +0000
+++ files/Flex.h
@@ -24,6 +24,7 @@ Foundation, Inc., 59 Temple Place - Suit
 #include <vector>
 #include <string>
 #include <iosfwd>
+#include <cstring>
 #include "common_types.h"
 #include "U7file.h"
 

$NetBSD: patch-files_IFF.h,v 1.1 2011/11/25 21:53:26 joerg Exp $

--- files/IFF.h.orig	2011-11-25 17:27:16.000000000 +0000
+++ files/IFF.h
@@ -21,6 +21,7 @@ Foundation, Inc., 59 Temple Place - Suit
 
 #include <vector>
 #include <string>
+#include <cstring>
 #include "common_types.h"
 #include "U7file.h"
 

$NetBSD: patch-files_Table.cc,v 1.1 2011/11/25 21:53:26 joerg Exp $

--- files/Table.cc.orig	2011-11-25 17:26:41.000000000 +0000
+++ files/Table.cc
@@ -27,6 +27,7 @@ Foundation, Inc., 59 Temple Place - Suit
 #endif
 #include <iostream>
 #include "exceptions.h"
+#include <cstdlib>
 #include "utils.h"
 
 using std::string;

$NetBSD: patch-files_U7file.cc,v 1.1 2011/11/25 21:53:26 joerg Exp $

--- files/U7file.cc.orig	2011-11-25 17:28:14.000000000 +0000
+++ files/U7file.cc
@@ -24,6 +24,7 @@ Foundation, Inc., 59 Temple Place - Suit
 #  include <cstdio>
 #endif
 #include <iostream>
+#include <cstdlib>
 
 #include "U7file.h"
 #include "Flex.h"

$NetBSD: patch-files_listfiles.cc,v 1.1 2011/11/25 21:53:26 joerg Exp $

--- files/listfiles.cc.orig	2011-11-25 17:29:04.000000000 +0000
+++ files/listfiles.cc
@@ -24,6 +24,7 @@ Foundation, Inc., 59 Temple Place - Suit
 #  include <cstdlib>
 #  include <cctype>
 #  include <cstdio>
+#  include <cstring>
 #endif
 
 #include <vector>

$NetBSD: patch-files_msgfile.cc,v 1.1 2011/11/25 21:53:26 joerg Exp $

--- files/msgfile.cc.orig	2011-11-25 17:32:19.000000000 +0000
+++ files/msgfile.cc
@@ -24,6 +24,7 @@
 
 #include <iostream>
 #include <vector>
+#include <cstdlib>
 #include "utils.h"
 
 using std::istream;

$NetBSD: patch-files_utils.h,v 1.1 2011/11/25 21:53:26 joerg Exp $

--- files/utils.h.orig	2011-11-25 17:29:26.000000000 +0000
+++ files/utils.h
@@ -22,6 +22,7 @@
 #ifndef _UTILS_H_
 #define _UTILS_H_
 
+#include <cstdio>
 #include <iostream>
 #include <string>
 #ifndef ALPHA_LINUX_CXX
@@ -70,7 +71,6 @@ inline uint16 Read2
 	return (b0 | (b1 << 8));
 	}
 
-#ifdef BUFSIZ	/* Kludgy, but I don't want to include stdio.h all the time.*/
 /*
  *	Read a 2-byte value from a file.
  */
@@ -85,7 +85,6 @@ inline uint16 Read2
 	std::fread(&b1,sizeof(uint8),1,in);
 	return (b0 | (b1 << 8));
 	}
-#endif
 
 /*
  *	Read a 2-byte value, hsb first.
@@ -113,7 +112,6 @@ inline uint16 Read2high
 	return ((b0 << 8) | b1);
 	}
 
-#ifdef BUFSIZ	/* Kludgy, but I don't want to include stdio.h all the time.*/
 /*
  *	Read a 2-byte value from a file.
  */
@@ -128,7 +126,6 @@ inline uint16 Read2high
 	std::fread(&b1,sizeof(uint8),1,in);
 	return ((b0 << 8) | b1);
 	}
-#endif
 
 /*
  *	Read a 4-byte long value, lsb first.
@@ -160,7 +157,6 @@ inline uint32 Read4
 	return (b0 | (b1<<8) | (b2<<16) | (b3<<24));
 	}
 
-#ifdef BUFSIZ	/* Kludgy, but I don't want to include stdio.h all the time.*/
 /*
  *	Read a 4-byte value from a file.
  */
@@ -177,7 +173,6 @@ inline uint32 Read4
 	std::fread(&b3,sizeof(uint8),1,in);
 	return (b0 | (b1<<8) | (b2<<16) | (b3<<24));
 	}
-#endif
 /*
  *	Read a 4-byte long value, hsb first.
  */
@@ -208,7 +203,6 @@ inline uint32 Read4high
 	return ((b0<<24) | (b1<<16) | (b2<<8) | b3);
 	}
 
-#ifdef BUFSIZ	/* Kludgy, but I don't want to include stdio.h all the time.*/
 /*
  *	Read a 4-byte value from a file.
  */
@@ -225,7 +219,6 @@ inline uint32 Read4high
 	std::fread(&b3,sizeof(uint8),1,in);
 	return ((b0<<24) | (b1<<16) | (b2<<8) | b3);
 	}
-#endif
 
 /*
  *	Write a 1-byte value.

$NetBSD: patch-imagewin_ibuf8.cc,v 1.1 2011/11/25 21:53:26 joerg Exp $

--- imagewin/ibuf8.cc.orig	2011-11-25 17:36:29.000000000 +0000
+++ imagewin/ibuf8.cc
@@ -25,6 +25,8 @@
 
 #include "ibuf8.h"
 #ifndef ALPHA_LINUX_CXX
+#  include <cstring>
+#  include <cstdlib>
 #  include <string>
 #  include <iostream>
 #endif

$NetBSD: patch-objs_chunkter.cc,v 1.1 2011/11/25 21:53:26 joerg Exp $

--- objs/chunkter.cc.orig	2011-11-25 17:56:42.000000000 +0000
+++ objs/chunkter.cc
@@ -30,6 +30,7 @@ Foundation, Inc., 59 Temple Place - Suit
 #ifdef INCL_OPENGL
 #include "glshape.h"
 #endif
+#include <cstring>
 
 Chunk_terrain *Chunk_terrain::render_queue = 0;
 int Chunk_terrain::queue_size = 0;

$NetBSD: patch-party.cc,v 1.1 2011/11/25 21:53:26 joerg Exp $

--- party.cc.orig	2011-11-25 18:04:22.000000000 +0000
+++ party.cc
@@ -25,6 +25,7 @@
 #endif
 
 #include <iostream>
+#include <cstring>
 #include <string>
 #include "party.h"
 #include "actors.h"

$NetBSD: patch-server_objserial.cc,v 1.1 2011/11/25 21:53:26 joerg Exp $

--- server/objserial.cc.orig	2011-11-25 17:58:05.000000000 +0000
+++ server/objserial.cc
@@ -30,6 +30,7 @@ Foundation, Inc., 59 Temple Place - Suit
 #include "objserial.h"
 #include "servemsg.h"
 #include <iostream>
+#include <cstring>
 
 using std::cout;
 using std::endl;

$NetBSD: patch-server_server.cc,v 1.1 2011/11/25 21:53:26 joerg Exp $

--- server/server.cc.orig	2011-11-25 18:01:01.000000000 +0000
+++ server/server.cc
@@ -45,6 +45,8 @@ Foundation, Inc., 59 Temple Place - Suit
 #endif
 
 #include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 #ifdef _AIX
 #include <strings.h>

$NetBSD: patch-shapes_shapeinf.cc,v 1.1 2011/11/25 21:53:26 joerg Exp $

--- shapes/shapeinf.cc.orig	2011-11-25 17:35:12.000000000 +0000
+++ shapes/shapeinf.cc
@@ -32,6 +32,7 @@ Foundation, Inc., 59 Temple Place - Suit
 
 #include "utils.h"
 #include <iomanip>	/* Debugging */
+#include <cstring>
 using std::cout;
 using std::endl;
 

$NetBSD: patch-shapes_shapewrite.cc,v 1.1 2011/11/25 21:53:26 joerg Exp $

--- shapes/shapewrite.cc.orig	2011-11-25 17:35:49.000000000 +0000
+++ shapes/shapewrite.cc
@@ -24,6 +24,7 @@
 #  include <config.h>
 #endif
 
+#include <cstring>
 #include "shapevga.h"
 #include "shapeinf.h"
 #include "monstinf.h"

$NetBSD: patch-tools_cmanip.cc,v 1.1 2011/11/25 21:53:26 joerg Exp $

--- tools/cmanip.cc.orig	2011-11-25 17:39:15.000000000 +0000
+++ tools/cmanip.cc
@@ -23,6 +23,7 @@ Foundation, Inc., 59 Temple Place - Suit
 
 #ifndef ALPHA_LINUX_CXX
 #  include <cstdio>
+#  include <cstdlib>
 #endif
 #include "Configuration.h"
 #include <iostream>

$NetBSD: patch-tools_splitshp.cc,v 1.1 2011/11/25 21:53:26 joerg Exp $

--- tools/splitshp.cc.orig	2011-11-25 17:38:30.000000000 +0000
+++ tools/splitshp.cc
@@ -24,6 +24,7 @@ Foundation, Inc., 59 Temple Place - Suit
 
 #ifndef ALPHA_LINUX_CXX
 #  include <cstdio>
+#  include <cstdlib>
 #  include <cstring>
 #  include <string>
 #endif

$NetBSD: patch-usecode_compiler_ucfun.cc,v 1.1 2011/11/25 21:53:26 joerg Exp $

--- usecode/compiler/ucfun.cc.orig	2011-11-25 17:50:25.000000000 +0000
+++ usecode/compiler/ucfun.cc
@@ -28,6 +28,7 @@ Foundation, Inc., 59 Temple Place - Suit
 
 #include <stdio.h>
 #include <cassert>
+#include <cstring>
 #include "ucfun.h"
 #include "ucstmt.h"
 #include "utils.h"

$NetBSD: patch-usecode_compiler_uclex.ll,v 1.1 2011/11/25 21:53:26 joerg Exp $

--- usecode/compiler/uclex.ll.orig	2011-11-25 17:49:15.000000000 +0000
+++ usecode/compiler/uclex.ll
@@ -23,6 +23,7 @@ along with this program; if not, write t
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
+#include <cstring>
 #include <string>
 #include <vector>
 #include "ucparse.h"

$NetBSD: patch-usecode_compiler_ucloc.cc,v 1.1 2011/11/25 21:53:26 joerg Exp $

--- usecode/compiler/ucloc.cc.orig	2011-11-25 17:50:54.000000000 +0000
+++ usecode/compiler/ucloc.cc
@@ -27,6 +27,7 @@ Foundation, Inc., 59 Temple Place - Suit
 #endif
 
 #include <iostream>
+#include <cstring>
 #include "ucloc.h"
 
 using std::strcmp;

$NetBSD: patch-usecode_compiler_ucmain.cc,v 1.1 2011/11/25 21:53:26 joerg Exp $

--- usecode/compiler/ucmain.cc.orig	2011-11-25 17:49:32.000000000 +0000
+++ usecode/compiler/ucmain.cc
@@ -29,6 +29,7 @@ Foundation, Inc., 59 Temple Place - Suit
 #include <fstream>
 #include <unistd.h>
 #include <stdio.h>
+#include <cstring>
 #include <string>
 #include <vector>
 #include "ucloc.h"

$NetBSD: patch-usecode_compiler_ucparse.yy,v 1.1 2011/11/25 21:53:26 joerg Exp $

--- usecode/compiler/ucparse.yy.orig	2011-11-25 17:48:55.000000000 +0000
+++ usecode/compiler/ucparse.yy
@@ -29,7 +29,7 @@ Foundation, Inc., 59 Temple Place - Suit
 #include <iostream>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <cstring>
 #include <vector>
 
 #include "ucfun.h"

$NetBSD: patch-usecode_compiler_ucsym.cc,v 1.1 2011/11/25 21:53:26 joerg Exp $

--- usecode/compiler/ucsym.cc.orig	2011-11-25 17:51:14.000000000 +0000
+++ usecode/compiler/ucsym.cc
@@ -27,6 +27,7 @@ Foundation, Inc., 59 Temple Place - Suit
 #endif
 
 
+#include <cstring>
 #include <stdio.h>
 #include "ucsym.h"
 #include "opcodes.h"

$NetBSD: patch-usecode_ucmachine.cc,v 1.1 2011/11/25 21:53:26 joerg Exp $

--- usecode/ucmachine.cc.orig	2011-11-25 17:54:27.000000000 +0000
+++ usecode/ucmachine.cc
@@ -23,6 +23,7 @@
 #  include <config.h>
 #endif
 
+#include <cstring>
 #include "ucmachine.h"
 #include "keyring.h"
 #include "conversation.h"

$NetBSD: patch-usecode_ucxt_head2data.cc,v 1.1 2011/11/25 21:53:26 joerg Exp $

--- usecode/ucxt/head2data.cc.orig	2011-11-25 17:51:52.000000000 +0000
+++ usecode/ucxt/head2data.cc
@@ -8,6 +8,7 @@
 #include <iomanip>
 #include <vector>
 #include <fstream>
+#include <cstdlib>
 
 using std::cout;
 using std::cerr;

$NetBSD: patch-usecode_ucxt_include_ops.h,v 1.1 2011/11/25 21:53:26 joerg Exp $

--- usecode/ucxt/include/ops.h.orig	2011-11-25 17:52:40.000000000 +0000
+++ usecode/ucxt/include/ops.h
@@ -19,6 +19,7 @@
 #ifndef OPCODES_H
 #define OPCODES_H
 
+#include <cstdlib>
 #include <map>
 #include <string>
 #include <vector>

$NetBSD: patch-usecode_useval.h,v 1.1 2011/11/25 21:53:26 joerg Exp $

--- usecode/useval.h.orig	2011-11-25 17:54:48.000000000 +0000
+++ usecode/useval.h
@@ -23,6 +23,7 @@
 #define USEVAL_H	1
 
 #include <cassert>
+#include <cstdlib>
 #include <iostream>
 
 #include <vector>	// STL container