- Fix building with GCC 4.x.

Reported by:	pointyhat

11 files changed, 185 insertions, 5 deletions

diff --git a/games/quakeforge/files/patch-configure b/games/quakeforge/files/patch-configure
index 432e7c91216..d4b93aa5272 100644
--- a/games/quakeforge/files/patch-configure
+++ b/games/quakeforge/files/patch-configure
@@ -1,5 +1,5 @@
---- configure.orig	Fri Aug 20 12:01:33 2004
-+++ configure	Fri Aug 20 12:02:10 2004
+--- ./configure.orig	Sun May  2 17:53:17 2004
++++ ./configure	Sun Dec 17 15:50:06 2006
 @@ -22733,7 +22733,7 @@
  int
  main ()
diff --git a/games/quakeforge/files/patch-include__QF__console.h b/games/quakeforge/files/patch-include__QF__console.h
new file mode 100644
index 00000000000..d292c742755
--- /dev/null
+++ b/games/quakeforge/files/patch-include__QF__console.h
@@ -0,0 +1,9 @@
+--- ./include/QF/console.h.orig	Fri Jul 25 19:21:42 2003
++++ ./include/QF/console.h	Sun Dec 17 15:59:27 2006
+@@ -141,6 +141,4 @@
+ void Menu_Enter (void);
+ void Menu_Leave (void);
+ 
+-extern struct cvar_s *con_size;
+-
+ #endif // __console_h
diff --git a/games/quakeforge/files/patch-include__QF__sound.h b/games/quakeforge/files/patch-include__QF__sound.h
new file mode 100644
index 00000000000..e09028a11ca
--- /dev/null
+++ b/games/quakeforge/files/patch-include__QF__sound.h
@@ -0,0 +1,34 @@
+--- ./include/QF/sound.h.orig	Tue Jan 20 23:52:07 2004
++++ ./include/QF/sound.h	Sun Dec 17 15:50:06 2006
+@@ -112,31 +112,14 @@
+ // number of times S_Update() is called per second.
+ //
+ 
+-extern qboolean 		fakedma;
+ extern int 			fakedma_updates;
+ extern unsigned paintedtime;
+-extern unsigned soundtime;
+-extern vec3_t listener_origin;
+-extern vec3_t listener_forward;
+-extern vec3_t listener_right;
+-extern vec3_t listener_up;
+-extern vec_t sound_nominal_clip_dist;
+ 
+ extern	struct cvar_s *snd_loadas8bit;
+-extern	struct cvar_s *bgmvolume;
+ extern	struct cvar_s *volume;
+ 
+-extern	struct cvar_s *snd_mixahead;
+-extern	struct cvar_s	*snd_device;
+-extern	struct cvar_s	*snd_rate;
+-extern	struct cvar_s	*snd_bits;
+-extern	struct cvar_s	*snd_stereo;
+ extern	struct cvar_s	*snd_interp;
+ extern	struct cvar_s *snd_stereo_phase_separation;
+-
+-extern qboolean	snd_initialized;
+-
+-extern int		snd_blocked;
+ 
+ void S_LocalSound (const char *s);
+ 
diff --git a/games/quakeforge/files/patch-include__context_x11.h b/games/quakeforge/files/patch-include__context_x11.h
new file mode 100644
index 00000000000..25a906b6dd9
--- /dev/null
+++ b/games/quakeforge/files/patch-include__context_x11.h
@@ -0,0 +1,15 @@
+--- ./include/context_x11.h.orig	Sun Mar 21 02:39:59 2004
++++ ./include/context_x11.h	Sun Dec 17 16:04:17 2006
+@@ -51,12 +51,10 @@
+ extern Window	x_root;
+ extern Window	x_win;
+ extern XVisualInfo *x_visinfo;
+-extern vec3_t	x_gamma;
+ extern int		x_screen;
+ extern int		x_shmeventtype;
+ extern Time		x_time;
+ extern Time		x_mouse_time;
+-extern qboolean doShm;
+ extern qboolean oktodraw;
+ extern qboolean x_have_focus;
+ 
diff --git a/games/quakeforge/files/patch-libs__console__server.c b/games/quakeforge/files/patch-libs__console__server.c
new file mode 100644
index 00000000000..92f8cb4db31
--- /dev/null
+++ b/games/quakeforge/files/patch-libs__console__server.c
@@ -0,0 +1,11 @@
+--- ./libs/console/server.c.orig	Tue Jan 27 02:23:36 2004
++++ ./libs/console/server.c	Sun Dec 17 15:53:42 2006
+@@ -70,7 +70,7 @@
+ 
+ #include "compat.h"
+ 
+-static console_data_t con_data;
++console_data_t con_data;
+ 
+ static QFile  *log_file;
+ static cvar_t *sv_logfile;
diff --git a/games/quakeforge/files/patch-libs__gib__gib_classes.c b/games/quakeforge/files/patch-libs__gib__gib_classes.c
new file mode 100644
index 00000000000..1fd200a7edf
--- /dev/null
+++ b/games/quakeforge/files/patch-libs__gib__gib_classes.c
@@ -0,0 +1,27 @@
+--- ./libs/gib/gib_classes.c.orig	Fri Nov 28 23:01:31 2003
++++ ./libs/gib/gib_classes.c	Sun Dec 17 15:56:41 2006
+@@ -192,7 +192,7 @@
+ 	unsigned int size;
+ 	unsigned int i = 0;
+ 	
+-	static qboolean
++	qboolean
+ 	iterator (gib_class_t *class, void *unused)
+ 	{
+ 		reply[i++] = class->name;
+@@ -610,13 +610,13 @@
+ 	gib_classdesc_t desc;
+ 	enum {CLASS, INSTANCE} mode = INSTANCE;
+ 	
+-	static void
++	void
+ 	mtabfree (void *mtab, void *unused)
+ 	{
+ 		free (mtab);
+ 	}
+ 
+-	static const char *
++	const char *
+ 	fname (const char *str)
+ 	{
+ 		if (mode == INSTANCE)
diff --git a/games/quakeforge/files/patch-libs__gib__gib_function.c b/games/quakeforge/files/patch-libs__gib__gib_function.c
new file mode 100644
index 00000000000..05a1f1b9588
--- /dev/null
+++ b/games/quakeforge/files/patch-libs__gib__gib_function.c
@@ -0,0 +1,20 @@
+--- ./libs/gib/gib_function.c.orig	Fri Apr  9 15:18:19 2004
++++ ./libs/gib/gib_function.c	Sun Dec 17 15:57:10 2006
+@@ -169,7 +169,7 @@
+ 	gib_var_t  *var;
+ 	static char argss[] = "args";
+ 
+-	static qboolean 
++	qboolean 
+ 	iterate (char *arg, llist_node_t *node)
+ 	{	
+ 		var = GIB_Var_Get_Complex (&GIB_DATA(cbuf)->locals, &zero,
+@@ -207,7 +207,7 @@
+ 	gib_var_t  *var;
+ 	static char argss[] = "args";
+ 
+-	static qboolean 
++	qboolean 
+ 	iterate (char *arg, llist_node_t *node)
+ 	{	
+ 		var = GIB_Var_Get_Complex (&GIB_DATA(cbuf)->locals, &zero,
diff --git a/games/quakeforge/files/patch-libs__gib__gib_thread.c b/games/quakeforge/files/patch-libs__gib__gib_thread.c
new file mode 100644
index 00000000000..824fb31addd
--- /dev/null
+++ b/games/quakeforge/files/patch-libs__gib__gib_thread.c
@@ -0,0 +1,11 @@
+--- ./libs/gib/gib_thread.c.orig	Thu Sep 11 03:03:10 2003
++++ ./libs/gib/gib_thread.c	Sun Dec 17 15:57:31 2006
+@@ -89,7 +89,7 @@
+ void
+ GIB_Thread_Execute (void)
+ {
+-	static qboolean iterator (cbuf_t *cbuf, llist_node_t *node)
++	qboolean iterator (cbuf_t *cbuf, llist_node_t *node)
+ 	{
+ 		if (GIB_DATA(cbuf)->program)
+ 			Cbuf_Execute_Stack (cbuf);
diff --git a/games/quakeforge/files/patch-nq__source__sys_unix.c b/games/quakeforge/files/patch-nq__source__sys_unix.c
index 7bcb34b9bec..9ff2b01f003 100644
--- a/games/quakeforge/files/patch-nq__source__sys_unix.c
+++ b/games/quakeforge/files/patch-nq__source__sys_unix.c
@@ -1,7 +1,7 @@
---- nq/source/sys_unix.c.orig
-+++ nq/source/sys_unix.c
+--- ./nq/source/sys_unix.c.orig	Wed Jan 15 12:31:28 2003
++++ ./nq/source/sys_unix.c	Sun Dec 17 15:50:06 2006
 @@ -69,6 +69,9 @@
-        fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~O_NONBLOCK);
+ 	fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~O_NONBLOCK);
  }
  
 +extern void Key_Progs_Init (progs_t *pr);
diff --git a/games/quakeforge/files/patch-qw__source__cl_chat.c b/games/quakeforge/files/patch-qw__source__cl_chat.c
new file mode 100644
index 00000000000..447669ec029
--- /dev/null
+++ b/games/quakeforge/files/patch-qw__source__cl_chat.c
@@ -0,0 +1,44 @@
+--- ./qw/source/cl_chat.c.orig	Fri Jul 18 03:27:26 2003
++++ ./qw/source/cl_chat.c	Sun Dec 17 16:05:14 2006
+@@ -66,7 +66,7 @@
+ static void
+ CL_Ignore_Sanity_Check (void)
+ {
+-	static qboolean iterator (ignore_t *ig, llist_node_t *node)
++	qboolean iterator (ignore_t *ig, llist_node_t *node)
+ 	{
+ 		if (cl.players[ig->slot].userid != ig->uid) // We got out of sync somehow
+ 			llist_remove (node);
+@@ -80,12 +80,12 @@
+ {
+ 	CL_Ignore_Sanity_Check ();
+ 	if (Cmd_Argc () == 1) {
+-		static qboolean live_iterator (ignore_t *ig, llist_node_t *node)
++		qboolean live_iterator (ignore_t *ig, llist_node_t *node)
+ 		{
+ 			Sys_Printf ("%5i - %s\n", ig->uid, Info_ValueForKey (cl.players[ig->slot].userinfo, "name"));
+ 			return true;
+ 		}
+-		static qboolean dead_iterator (ignore_t *ig, llist_node_t *node)
++		qboolean dead_iterator (ignore_t *ig, llist_node_t *node)
+ 		{
+ 			Sys_Printf ("%s\n", ig->lastname);
+ 			return true;
+@@ -145,7 +145,7 @@
+ 	dstring_t *test = dstring_newstr ();
+ 	qboolean allowed = true;
+ 
+-	static qboolean iterator (ignore_t *ig, llist_node_t *node)
++	qboolean iterator (ignore_t *ig, llist_node_t *node)
+ 	{
+ 		if (cl.players[ig->slot].userid != ig->uid) { // We got out of sync somehow
+ 			llist_remove (node);
+@@ -183,7 +183,7 @@
+ {
+ 	ignore_t *found = 0;
+ 
+-	static qboolean iterator (ignore_t *ig, llist_node_t *node)
++	qboolean iterator (ignore_t *ig, llist_node_t *node)
+ 	{
+ 		if (!strcmp (ig->lastname, name)) {
+ 			found = ig;
diff --git a/games/quakeforge/files/patch-tools__qfcc__include__method.h b/games/quakeforge/files/patch-tools__qfcc__include__method.h
new file mode 100644
index 00000000000..8e772738abd
--- /dev/null
+++ b/games/quakeforge/files/patch-tools__qfcc__include__method.h
@@ -0,0 +1,9 @@
+--- ./tools/qfcc/include/method.h.orig	Wed Feb  4 01:49:46 2004
++++ ./tools/qfcc/include/method.h	Sun Dec 17 16:07:08 2006
+@@ -99,6 +99,4 @@
+ 
+ struct expr_s *method_check_params (method_t *method, struct expr_s *args);
+ 
+-extern struct hashtab_s *known_methods;
+-
+ #endif//__method_h