From d295f183bac1e65c7d24bdd505cefc805a1277fa Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Sat, 21 Oct 2000 07:34:56 +0000 Subject: [PATCH] remove va from commdef.h and fix the consequences --- include/commdef.h | 3 --- source/cl_cvar.c | 1 + source/cl_demo.c | 1 + source/cl_main.c | 1 + source/cl_parse.c | 1 + source/cl_slist.c | 5 ++++- source/console.c | 8 +++++--- source/context_x11.c | 1 + source/menu.c | 1 + source/pr_cmds.c | 1 + source/quakefs.c | 1 + source/sbar.c | 1 + source/skin.c | 1 + source/sv_ccmds.c | 1 + source/sv_main.c | 1 + source/sv_user.c | 1 + source/vid_glx.c | 1 + source/vid_mgl.c | 1 + source/vid_sdl.c | 1 + source/vid_sgl.c | 1 + source/vid_wgl.c | 1 + source/vid_x11.c | 1 + 22 files changed, 28 insertions(+), 7 deletions(-) diff --git a/include/commdef.h b/include/commdef.h index 463fa4c..59d10e6 100644 --- a/include/commdef.h +++ b/include/commdef.h @@ -62,7 +62,4 @@ extern qboolean host_initialized; /* True if into command execution. */ extern double realtime; /* Not bounded in any way, changed at start of every frame, never reset */ -char *va(char *format, ...) __attribute__((format(printf,1,2))); -// does a varargs printf into a temp buffer - #endif // _COMMDEF_H diff --git a/source/cl_cvar.c b/source/cl_cvar.c index cf54974..3aa2619 100644 --- a/source/cl_cvar.c +++ b/source/cl_cvar.c @@ -34,6 +34,7 @@ #include "msg.h" #include "client.h" #include "commdef.h" +#include "va.h" void Cvar_Info(cvar_t *var) diff --git a/source/cl_demo.c b/source/cl_demo.c index 0b48dd9..78a3185 100644 --- a/source/cl_demo.c +++ b/source/cl_demo.c @@ -38,6 +38,7 @@ #include "cmd.h" #include "console.h" #include "qendian.h" +#include "va.h" #include "quakefs.h" #include "quakedef.h" #include "pmove.h" diff --git a/source/cl_main.c b/source/cl_main.c index f1a1af7..bf60bbe 100644 --- a/source/cl_main.c +++ b/source/cl_main.c @@ -38,6 +38,7 @@ #include "cvar.h" #include "sizebuf.h" #include "msg.h" +#include "va.h" #include "client.h" #include "commdef.h" #include "cmd.h" diff --git a/source/cl_parse.c b/source/cl_parse.c index 21edf92..6fe96ca 100644 --- a/source/cl_parse.c +++ b/source/cl_parse.c @@ -38,6 +38,7 @@ #include "bothdefs.h" #include "console.h" #include "msg.h" +#include "va.h" #include "pmove.h" #include "sbar.h" #include "teamplay.h" diff --git a/source/cl_slist.c b/source/cl_slist.c index 3aac496..c41565f 100644 --- a/source/cl_slist.c +++ b/source/cl_slist.c @@ -32,12 +32,15 @@ #ifdef HAVE_CONFIG_H # include #endif + +#include + #include "cl_slist.h" #include "bothdefs.h" #include "console.h" #include "commdef.h" #include "quakefs.h" -#include +#include "va.h" server_entry_t *slist; diff --git a/source/console.c b/source/console.c index 9e432c0..86a11eb 100644 --- a/source/console.c +++ b/source/console.c @@ -29,6 +29,10 @@ #ifdef HAVE_CONFIG_H # include #endif + +#include +#include + #include "input.h" #include "sys.h" #include "console.h" @@ -38,11 +42,9 @@ #include "commdef.h" #include "qargs.h" #include "cmd.h" +#include "va.h" #include "screen.h" -#include -#include - int con_ormask; console_t con_main; console_t con_chat; diff --git a/source/context_x11.c b/source/context_x11.c index 2fbb7a6..0954356 100644 --- a/source/context_x11.c +++ b/source/context_x11.c @@ -58,6 +58,7 @@ #include "commdef.h" #include "context_x11.h" #include "dga_check.h" +#include "va.h" #include "qargs.h" #include "qtypes.h" #include "vid.h" diff --git a/source/menu.c b/source/menu.c index e98ee0e..79506fb 100644 --- a/source/menu.c +++ b/source/menu.c @@ -38,6 +38,7 @@ #include "keys.h" #include "menu.h" #include "vid.h" +#include "va.h" #include "draw.h" #include "cmd.h" #include "screen.h" diff --git a/source/pr_cmds.c b/source/pr_cmds.c index 1746067..e5cec22 100644 --- a/source/pr_cmds.c +++ b/source/pr_cmds.c @@ -30,6 +30,7 @@ # include #endif #include "pr_comp.h" +#include "va.h" #include "progs.h" #include "console.h" #include "server.h" diff --git a/source/quakefs.c b/source/quakefs.c index 24739de..a2d0968 100644 --- a/source/quakefs.c +++ b/source/quakefs.c @@ -40,6 +40,7 @@ #include "qendian.h" #include "info.h" #include "server.h" +#include "va.h" #include "qargs.h" #include diff --git a/source/sbar.c b/source/sbar.c index 84fd15c..b0b70e7 100644 --- a/source/sbar.c +++ b/source/sbar.c @@ -38,6 +38,7 @@ #include "cmd.h" #include "client.h" #include "bothdefs.h" +#include "va.h" #include "msg.h" #include diff --git a/source/skin.c b/source/skin.c index d516f71..c73654d 100644 --- a/source/skin.c +++ b/source/skin.c @@ -35,6 +35,7 @@ #include "client.h" #include "console.h" #include "commdef.h" +#include "va.h" #include diff --git a/source/sv_ccmds.c b/source/sv_ccmds.c index 36497fb..598689b 100644 --- a/source/sv_ccmds.c +++ b/source/sv_ccmds.c @@ -38,6 +38,7 @@ #include "sys.h" #include "pmove.h" #include "compat.h" +#include "va.h" #include "quakefs.h" #include "bothdefs.h" #include "qendian.h" diff --git a/source/sv_main.c b/source/sv_main.c index a3605db..dcc56d8 100644 --- a/source/sv_main.c +++ b/source/sv_main.c @@ -30,6 +30,7 @@ # include #endif #include "server.h" +#include "va.h" #include "crc.h" #include "msg.h" #include "world.h" diff --git a/source/sv_user.c b/source/sv_user.c index 8826cfc..ba6d298 100644 --- a/source/sv_user.c +++ b/source/sv_user.c @@ -29,6 +29,7 @@ #ifdef HAVE_CONFIG_H # include #endif +#include "va.h" #include "server.h" #include "crc.h" #include "console.h" diff --git a/source/vid_glx.c b/source/vid_glx.c index 15af873..e380969 100644 --- a/source/vid_glx.c +++ b/source/vid_glx.c @@ -62,6 +62,7 @@ #endif #include "qtypes.h" +#include "va.h" #include "quakedef.h" #include "qendian.h" #include "glquake.h" diff --git a/source/vid_mgl.c b/source/vid_mgl.c index 6e073a8..5e106e7 100644 --- a/source/vid_mgl.c +++ b/source/vid_mgl.c @@ -32,6 +32,7 @@ #include #include "quakedef.h" +#include "va.h" #include "winquake.h" #include "sys.h" #include "d_local.h" diff --git a/source/vid_sdl.c b/source/vid_sdl.c index c78e74f..5c86040 100644 --- a/source/vid_sdl.c +++ b/source/vid_sdl.c @@ -33,6 +33,7 @@ #include #include "client.h" +#include "va.h" #include "console.h" #include "cvar.h" #include "draw.h" diff --git a/source/vid_sgl.c b/source/vid_sgl.c index 74a0d91..c316ba4 100644 --- a/source/vid_sgl.c +++ b/source/vid_sgl.c @@ -41,6 +41,7 @@ #include "console.h" #include "cvar.h" #include "draw.h" +#include "va.h" #include "glquake.h" #include "input.h" #include "joystick.h" diff --git a/source/vid_wgl.c b/source/vid_wgl.c index 1c5510e..339307c 100644 --- a/source/vid_wgl.c +++ b/source/vid_wgl.c @@ -30,6 +30,7 @@ # include "config.h" #endif #include "quakedef.h" +#include "va.h" #include "winquake.h" #include "sys.h" #include "resource.h" diff --git a/source/vid_x11.c b/source/vid_x11.c index b081824..f55016f 100644 --- a/source/vid_x11.c +++ b/source/vid_x11.c @@ -64,6 +64,7 @@ #include "input.h" #include "draw.h" #include "console.h" +#include "va.h" #include "client.h" #include "input.h" #include "context_x11.h"