From 800ee055841cc9ececa42b60ccc2138ed0ac95fe Mon Sep 17 00:00:00 2001 From: Ragnvald Maartmann-Moe IV Date: Wed, 7 Feb 2001 05:45:59 +0000 Subject: [PATCH] More whitespace than you can shake a shambler at. --- include/anorms.h | 2 +- include/asm_i386.h | 4 +- include/bothdefs.h | 4 +- include/compat.h | 1 + include/fbset.h | 2 +- include/gcc_attr.h | 2 +- include/host.h | 2 +- include/info.h | 2 +- include/mathlib.h | 2 +- include/mdfour.h | 2 +- include/qendian.h | 2 +- include/qfgl_ext.h | 118 ++++++++++++++--------------- include/quakeio.h | 3 +- include/sv_pr_cmds.h | 2 +- include/texture.h | 2 +- include/uint32.h | 22 +++--- include/win32/bc/borland.c | 8 +- include/win32/bc/config.h | 48 ++++++------ include/win32/fnmatch.h | 14 ++-- include/win32/mingw/config.h | 48 ++++++------ include/win32/resources/resource.h | 12 +-- include/win32/vc/config.h | 40 +++++----- include/winquake.h | 1 + source/cd_sdl.c | 5 +- source/cd_win.c | 1 + source/checksum.c | 5 +- source/cl_cam.c | 8 +- source/cl_cmd.c | 5 +- source/cl_slist.c | 9 +-- source/cl_sys_sdl.c | 18 ++--- source/cl_sys_win.c | 1 + source/cl_tent.c | 12 +-- source/cmd.c | 8 +- source/console.c | 6 +- source/context_x11.c | 6 +- source/cvar.c | 12 +-- source/d_surf.c | 4 +- source/dga_check.c | 4 +- source/draw.c | 5 +- source/fnmatch.c | 4 +- source/fractalnoise.c | 2 +- source/gl_mesh.c | 6 +- source/gl_rsurf.c | 8 +- source/in_fbdev.c | 11 +-- source/in_sdl.c | 2 +- source/in_svgalib.c | 7 +- source/in_win.c | 1 - source/in_x11.c | 25 +++--- source/info.c | 12 +-- source/joy_win.c | 1 - source/keys.c | 12 +-- source/locs.c | 8 +- source/menu.c | 13 ++-- source/model_brush.c | 9 ++- source/msg.c | 5 +- source/net_chan.c | 4 +- source/net_udp.c | 12 +-- source/net_udp6.c | 17 +++-- source/pcx.c | 5 +- source/pr_edict.c | 5 +- source/qargs.c | 6 +- source/qfgl_ext.c | 5 +- source/quakefs.c | 13 +--- source/quakeio.c | 10 +-- source/r_sprite.c | 6 +- source/sbar.c | 8 +- source/screen.c | 8 +- source/sizebuf.c | 5 +- source/snd_alsa_0_5.c | 6 +- source/snd_disk.c | 6 +- source/snd_dma.c | 6 +- source/snd_mem.c | 5 +- source/snd_mix.c | 8 +- source/snd_sdl.c | 1 + source/snd_sun.c | 4 +- source/sv_ccmds.c | 8 +- source/sv_ents.c | 5 +- source/sv_init.c | 5 +- source/sv_main.c | 8 +- source/sv_nchan.c | 4 +- source/sv_pr_cmds.c | 5 +- source/sv_send.c | 4 +- source/sv_sys_unix.c | 14 ++-- source/teamplay.c | 8 +- source/tga.c | 5 +- source/vid_fbdev.c | 2 +- source/vid_sgl.c | 4 +- source/vid_win.c | 1 + source/world.c | 5 +- source/zone.c | 5 +- 90 files changed, 390 insertions(+), 411 deletions(-) diff --git a/include/anorms.h b/include/anorms.h index 4bff4c9..073691c 100644 --- a/include/anorms.h +++ b/include/anorms.h @@ -26,7 +26,7 @@ $Id$ */ #if defined(_WIN32) && !defined(__GNUC__) -#pragma warning(disable:4305) +# pragma warning(disable:4305) #endif {-0.525731, 0.000000, 0.850651}, {-0.442863, 0.238856, 0.864188}, diff --git a/include/asm_i386.h b/include/asm_i386.h index 5b51d26..bfe60fd 100644 --- a/include/asm_i386.h +++ b/include/asm_i386.h @@ -30,9 +30,9 @@ #define __ASM_I386__ #ifdef HAVE_SYM_PREFIX_UNDERSCORE -#define C(label) _##label +# define C(label) _##label #else -#define C(label) label +# define C(label) label #endif // diff --git a/include/bothdefs.h b/include/bothdefs.h index c384376..241f438 100644 --- a/include/bothdefs.h +++ b/include/bothdefs.h @@ -30,9 +30,9 @@ #define _BOTHDEFS_H #ifdef USE_INTEL_ASM -#define UNALIGNED_OK 1 // set to 0 if unaligned accesses are not supported +# define UNALIGNED_OK 1 // set to 0 if unaligned accesses are not supported #else -#define UNALIGNED_OK 0 +# define UNALIGNED_OK 0 #endif // !!! if this is changed, it must be changed in d_ifacea.h too !!! diff --git a/include/compat.h b/include/compat.h index 0553773..ffa0dad 100644 --- a/include/compat.h +++ b/include/compat.h @@ -38,6 +38,7 @@ #ifdef HAVE_SYS_TYPES_H # include #endif + #include #ifndef max diff --git a/include/fbset.h b/include/fbset.h index b0f6a85..842f7b3 100644 --- a/include/fbset.h +++ b/include/fbset.h @@ -16,7 +16,7 @@ #include #ifdef __GLIBC__ -#include +# include #endif #include diff --git a/include/gcc_attr.h b/include/gcc_attr.h index 1819920..6f3c8db 100644 --- a/include/gcc_attr.h +++ b/include/gcc_attr.h @@ -30,7 +30,7 @@ #define _GCC_ATTR_H #ifndef __GNUC__ -#define __attribute__(x) +# define __attribute__(x) #endif #endif // _GCC_ATTR_H diff --git a/include/host.h b/include/host.h index 3a5539b..cb7bc6b 100644 --- a/include/host.h +++ b/include/host.h @@ -38,7 +38,7 @@ //define PARANOID // speed sapping error checking #if defined(_WIN32) && !defined(__GNUC__) -#pragma warning( disable : 4244 4127 4201 4214 4514 4305 4115 4018) +# pragma warning( disable : 4244 4127 4201 4214 4514 4305 4115 4018) #endif #define MAX_NUM_ARGVS 50 diff --git a/include/info.h b/include/info.h index 384d6f8..58de6ca 100644 --- a/include/info.h +++ b/include/info.h @@ -30,7 +30,7 @@ #define _INFO_H #ifdef HAVE_CONFIG_H -#include "config.h" +# include "config.h" #endif #include // for size_t. sys/types.h SHOULD be used, but can't :(bc) diff --git a/include/mathlib.h b/include/mathlib.h index f8beb45..315db4c 100644 --- a/include/mathlib.h +++ b/include/mathlib.h @@ -33,7 +33,7 @@ #include "qtypes.h" #ifndef M_PI -#define M_PI 3.14159265358979323846 // matches value in gcc v2 math.h +# define M_PI 3.14159265358979323846 // matches value in gcc v2 math.h #endif struct mplane_s; diff --git a/include/mdfour.h b/include/mdfour.h index 356cb30..abfb195 100644 --- a/include/mdfour.h +++ b/include/mdfour.h @@ -30,7 +30,7 @@ #ifndef _MDFOUR_H #define _MDFOUR_H -#include "uint32.h" +#include "uint32.h" #define MDFOUR_DIGEST_BYTES 16 diff --git a/include/qendian.h b/include/qendian.h index 2f3ff2d..ceec262 100644 --- a/include/qendian.h +++ b/include/qendian.h @@ -34,7 +34,7 @@ #include "qtypes.h" #ifndef NULL -#define NULL ((void *)0) +# define NULL ((void *)0) #endif #define Q_MAXCHAR ((char)0x7f) diff --git a/include/qfgl_ext.h b/include/qfgl_ext.h index fc49368..04c17b3 100644 --- a/include/qfgl_ext.h +++ b/include/qfgl_ext.h @@ -32,7 +32,6 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif - #ifdef HAVE_WINDOWS_H # include #endif @@ -42,7 +41,6 @@ #ifdef HAVE_GL_GLX_H # include #endif - #ifdef HAVE_GL_GLEXT_H # include #endif @@ -60,81 +58,81 @@ // OpenGL numbers for extensions we use or want to use #ifndef GL_EXT_bgra -#define GL_EXT_bgra +# define GL_EXT_bgra # define GL_BGR_EXT 0x80E0 # define GL_BGRA_EXT 0x80E1 #endif #ifndef GL_EXT_paletted_texture -#define GL_EXT_paletted_texture -#define GL_COLOR_INDEX1_EXT 0x80E2 -#define GL_COLOR_INDEX2_EXT 0x80E3 -#define GL_COLOR_INDEX4_EXT 0x80E4 -#define GL_COLOR_INDEX8_EXT 0x80E5 -#define GL_COLOR_INDEX12_EXT 0x80E6 -#define GL_COLOR_INDEX16_EXT 0x80E7 -#define GL_TEXTURE_INDEX_SIZE_EXT 0x80ED +# define GL_EXT_paletted_texture +# define GL_COLOR_INDEX1_EXT 0x80E2 +# define GL_COLOR_INDEX2_EXT 0x80E3 +# define GL_COLOR_INDEX4_EXT 0x80E4 +# define GL_COLOR_INDEX8_EXT 0x80E5 +# define GL_COLOR_INDEX12_EXT 0x80E6 +# define GL_COLOR_INDEX16_EXT 0x80E7 +# define GL_TEXTURE_INDEX_SIZE_EXT 0x80ED #endif #ifndef GL_EXT_texture_object -#define GL_EXT_texture_object -#define GL_TEXTURE_PRIORITY_EXT 0x8066 -#define GL_TEXTURE_RESIDENT_EXT 0x8067 -#define GL_TEXTURE_1D_BINDING_EXT 0x8068 -#define GL_TEXTURE_2D_BINDING_EXT 0x8069 -#define GL_TEXTURE_3D_BINDING_EXT 0x806A +# define GL_EXT_texture_object +# define GL_TEXTURE_PRIORITY_EXT 0x8066 +# define GL_TEXTURE_RESIDENT_EXT 0x8067 +# define GL_TEXTURE_1D_BINDING_EXT 0x8068 +# define GL_TEXTURE_2D_BINDING_EXT 0x8069 +# define GL_TEXTURE_3D_BINDING_EXT 0x806A #endif #ifndef GL_EXT_point_parameters -#define GL_EXT_point_parameters -#define GL_POINT_SIZE_MIN_EXT 0x8126 -#define GL_POINT_SIZE_MAX_EXT 0x8127 -#define GL_POINT_FADE_THRESHOLD_SIZE_EXT 0x8128 -#define GL_DISTANCE_ATTENUATION_EXT 0x8129 +# define GL_EXT_point_parameters +# define GL_POINT_SIZE_MIN_EXT 0x8126 +# define GL_POINT_SIZE_MAX_EXT 0x8127 +# define GL_POINT_FADE_THRESHOLD_SIZE_EXT 0x8128 +# define GL_DISTANCE_ATTENUATION_EXT 0x8129 #endif #ifndef GL_EXT_shared_texture_palette -#define GL_EXT_shared_texture_palette -#define GL_SHARED_TEXTURE_PALETTE_EXT 0x81FB +# define GL_EXT_shared_texture_palette +# define GL_SHARED_TEXTURE_PALETTE_EXT 0x81FB #endif #ifndef GL_ARB_multitexture -#define GL_ARB_multitexture -#define GL_TEXTURE0_ARB 0x84C0 -#define GL_TEXTURE1_ARB 0x84C1 -#define GL_TEXTURE2_ARB 0x84C2 -#define GL_TEXTURE3_ARB 0x84C3 -#define GL_TEXTURE4_ARB 0x84C4 -#define GL_TEXTURE5_ARB 0x84C5 -#define GL_TEXTURE6_ARB 0x84C6 -#define GL_TEXTURE7_ARB 0x84C7 -#define GL_TEXTURE8_ARB 0x84C8 -#define GL_TEXTURE9_ARB 0x84C9 -#define GL_TEXTURE10_ARB 0x84CA -#define GL_TEXTURE11_ARB 0x84CB -#define GL_TEXTURE12_ARB 0x84CC -#define GL_TEXTURE13_ARB 0x84CD -#define GL_TEXTURE14_ARB 0x84CE -#define GL_TEXTURE15_ARB 0x84CF -#define GL_TEXTURE16_ARB 0x84D0 -#define GL_TEXTURE17_ARB 0x84D1 -#define GL_TEXTURE18_ARB 0x84D2 -#define GL_TEXTURE19_ARB 0x84D3 -#define GL_TEXTURE20_ARB 0x84D4 -#define GL_TEXTURE21_ARB 0x84D5 -#define GL_TEXTURE22_ARB 0x84D6 -#define GL_TEXTURE23_ARB 0x84D7 -#define GL_TEXTURE24_ARB 0x84D8 -#define GL_TEXTURE25_ARB 0x84D9 -#define GL_TEXTURE26_ARB 0x84DA -#define GL_TEXTURE27_ARB 0x84DB -#define GL_TEXTURE28_ARB 0x84DC -#define GL_TEXTURE29_ARB 0x84DD -#define GL_TEXTURE30_ARB 0x84DE -#define GL_TEXTURE31_ARB 0x84DF -#define GL_ACTIVE_TEXTURE_ARB 0x84E0 -#define GL_CLIENT_ACTIVE_TEXTURE_ARB 0x84E1 -#define GL_MAX_TEXTURE_UNITS_ARB 0x84E2 +# define GL_ARB_multitexture +# define GL_TEXTURE0_ARB 0x84C0 +# define GL_TEXTURE1_ARB 0x84C1 +# define GL_TEXTURE2_ARB 0x84C2 +# define GL_TEXTURE3_ARB 0x84C3 +# define GL_TEXTURE4_ARB 0x84C4 +# define GL_TEXTURE5_ARB 0x84C5 +# define GL_TEXTURE6_ARB 0x84C6 +# define GL_TEXTURE7_ARB 0x84C7 +# define GL_TEXTURE8_ARB 0x84C8 +# define GL_TEXTURE9_ARB 0x84C9 +# define GL_TEXTURE10_ARB 0x84CA +# define GL_TEXTURE11_ARB 0x84CB +# define GL_TEXTURE12_ARB 0x84CC +# define GL_TEXTURE13_ARB 0x84CD +# define GL_TEXTURE14_ARB 0x84CE +# define GL_TEXTURE15_ARB 0x84CF +# define GL_TEXTURE16_ARB 0x84D0 +# define GL_TEXTURE17_ARB 0x84D1 +# define GL_TEXTURE18_ARB 0x84D2 +# define GL_TEXTURE19_ARB 0x84D3 +# define GL_TEXTURE20_ARB 0x84D4 +# define GL_TEXTURE21_ARB 0x84D5 +# define GL_TEXTURE22_ARB 0x84D6 +# define GL_TEXTURE23_ARB 0x84D7 +# define GL_TEXTURE24_ARB 0x84D8 +# define GL_TEXTURE25_ARB 0x84D9 +# define GL_TEXTURE26_ARB 0x84DA +# define GL_TEXTURE27_ARB 0x84DB +# define GL_TEXTURE28_ARB 0x84DC +# define GL_TEXTURE29_ARB 0x84DD +# define GL_TEXTURE30_ARB 0x84DE +# define GL_TEXTURE31_ARB 0x84DF +# define GL_ACTIVE_TEXTURE_ARB 0x84E0 +# define GL_CLIENT_ACTIVE_TEXTURE_ARB 0x84E1 +# define GL_MAX_TEXTURE_UNITS_ARB 0x84E2 #endif /* Standard OpenGL external function defs */ diff --git a/include/quakeio.h b/include/quakeio.h index 86b2108..a53b9d0 100644 --- a/include/quakeio.h +++ b/include/quakeio.h @@ -35,8 +35,9 @@ #endif #include + #ifdef HAVE_ZLIB -#include +# include #endif #include "gcc_attr.h" diff --git a/include/sv_pr_cmds.h b/include/sv_pr_cmds.h index fe4b4e0..1d7abc7 100644 --- a/include/sv_pr_cmds.h +++ b/include/sv_pr_cmds.h @@ -32,7 +32,7 @@ #ifndef PROGS_T typedef struct progs_s progs_t; -#define PROGS_T +# define PROGS_T #endif char *PF_VarString (progs_t *pr, int first); diff --git a/include/texture.h b/include/texture.h index c9458b3..3e5c0c1 100644 --- a/include/texture.h +++ b/include/texture.h @@ -33,7 +33,7 @@ #define __texture_h #ifdef HAVE_CONFIG_H -#include "config.h" +# include "config.h" #endif // could not use texture_t as that is used for models. diff --git a/include/uint32.h b/include/uint32.h index 0db00dd..e977015 100644 --- a/include/uint32.h +++ b/include/uint32.h @@ -33,21 +33,21 @@ #define _UINT32_H #ifndef int32 -#if (SIZEOF_INT == 4) -#define int32 int -#elif (SIZEOF_LONG == 4) -#define int32 long -#elif (SIZEOF_SHORT == 4) -#define int32 short -#else +# if (SIZEOF_INT == 4) +# define int32 int +# elif (SIZEOF_LONG == 4) +# define int32 long +# elif (SIZEOF_SHORT == 4) +# define int32 short +# else /* I hope this works */ -#define int32 int -#define LARGE_INT32 -#endif +# define int32 int +# define LARGE_INT32 +# endif #endif #ifndef uint32 -#define uint32 unsigned int32 +# define uint32 unsigned int32 #endif #endif // _UINT32_H diff --git a/include/win32/bc/borland.c b/include/win32/bc/borland.c index 29dade0..5763cd2 100644 --- a/include/win32/bc/borland.c +++ b/include/win32/bc/borland.c @@ -42,17 +42,17 @@ void Sys_HighFPPrecision(void) void Sys_LowFPPrecision(void) { -return; + return; } void MaskExceptions(void) { -return; + return; } void Sys_SetFPCW(void) { -return; + return; } #endif @@ -74,5 +74,3 @@ void snprintf(char * buffer, size_t n, const char * format, ...) #endif #endif - - diff --git a/include/win32/bc/config.h b/include/win32/bc/config.h index 4455a7d..def126f 100644 --- a/include/win32/bc/config.h +++ b/include/win32/bc/config.h @@ -70,16 +70,16 @@ /* Define this to the subdirectory name of the default game */ #ifdef NEWSTYLE -# define BASEGAME "base" +# define BASEGAME "base" #else -# define BASEGAME "id1" +# define BASEGAME "id1" #endif /* Define this to the base directory for the client to download skins to */ #ifdef NEWSTYLE -# define SKINBASE "base" +# define SKINBASE "base" #else -# define SKINBASE "qw" +# define SKINBASE "qw" #endif /* Define if you have the XFree86 DGA extension */ @@ -286,26 +286,26 @@ /* Experimental 3DNOW support */ #ifdef HAVE_3DNOW_ASM - #define atan _atan - #define atan2 _atan2 - #define acos _acos - #define asin _asin - #define log _log - #define log10 _log10 - #define pow _pow - #define exp _exp - #define sqrt _sqrt - #define fabs _fabs - #define ceil _ceil - #define floor _floor - #define frexp _frexp - #define ldexp _ldexp - #define modf _modf - #define fmod _fmod - #define sincos _sincos - #define sin _sin - #define cos _cos - #define tan _tan +# define atan _atan +# define atan2 _atan2 +# define acos _acos +# define asin _asin +# define log _log +# define log10 _log10 +# define pow _pow +# define exp _exp +# define sqrt _sqrt +# define fabs _fabs +# define ceil _ceil +# define floor _floor +# define frexp _frexp +# define ldexp _ldexp +# define modf _modf +# define fmod _fmod +# define sincos _sincos +# define sin _sin +# define cos _cos +# define tan _tan #endif #endif // _CONFIG_H diff --git a/include/win32/fnmatch.h b/include/win32/fnmatch.h index d5eb700..7dd238d 100644 --- a/include/win32/fnmatch.h +++ b/include/win32/fnmatch.h @@ -27,11 +27,11 @@ extern "C" { #endif #if defined (__cplusplus) || (defined (__STDC__) && __STDC__) -#undef __P -#define __P(args) args +# undef __P +# define __P(args) args #else /* Not C++ or ANSI C. */ -#undef __P -#define __P(args) () +# undef __P +# define __P(args) () /* We can get away without defining `const' here only because in this file it is used only inside the prototype for `fnmatch', which is elided in non-ANSI C where `const' is problematical. */ @@ -50,9 +50,9 @@ extern "C" { #define FNM_PERIOD (1 << 2) /* Leading `.' is matched only explicitly. */ #if !defined (_POSIX_C_SOURCE) || _POSIX_C_SOURCE < 2 || defined (_GNU_SOURCE) -#define FNM_FILE_NAME FNM_PATHNAME /* Preferred GNU name. */ -#define FNM_LEADING_DIR (1 << 3) /* Ignore `/...' after a match. */ -#define FNM_CASEFOLD (1 << 4) /* Compare without regard to case. */ +# define FNM_FILE_NAME FNM_PATHNAME /* Preferred GNU name. */ +# define FNM_LEADING_DIR (1 << 3) /* Ignore `/...' after a match. */ +# define FNM_CASEFOLD (1 << 4) /* Compare without regard to case. */ #endif /* Value returned by `fnmatch' if STRING does not match PATTERN. */ diff --git a/include/win32/mingw/config.h b/include/win32/mingw/config.h index 032f411..7ed9702 100644 --- a/include/win32/mingw/config.h +++ b/include/win32/mingw/config.h @@ -73,16 +73,16 @@ /* Define this to the subdirectory name of the default game */ #ifdef NEWSTYLE -# define BASEGAME "base" +# define BASEGAME "base" #else -# define BASEGAME "id1" +# define BASEGAME "id1" #endif /* Define this to the base directory for the client to download skins to */ #ifdef NEWSTYLE -# define SKINBASE "base" +# define SKINBASE "base" #else -# define SKINBASE "qw" +# define SKINBASE "qw" #endif /* Define if you have the XFree86 DGA extension */ @@ -284,26 +284,26 @@ /* Experimental 3DNOW support */ #ifdef HAVE_3DNOW_ASM - #define atan _atan - #define atan2 _atan2 - #define acos _acos - #define asin _asin - #define log _log - #define log10 _log10 - #define pow _pow - #define exp _exp - #define sqrt _sqrt - #define fabs _fabs - #define ceil _ceil - #define floor _floor - #define frexp _frexp - #define ldexp _ldexp - #define modf _modf - #define fmod _fmod - #define sincos _sincos - #define sin _sin - #define cos _cos - #define tan _tan +# define atan _atan +# define atan2 _atan2 +# define acos _acos +# define asin _asin +# define log _log +# define log10 _log10 +# define pow _pow +# define exp _exp +# define sqrt _sqrt +# define fabs _fabs +# define ceil _ceil +# define floor _floor +# define frexp _frexp +# define ldexp _ldexp +# define modf _modf +# define fmod _fmod +# define sincos _sincos +# define sin _sin +# define cos _cos +# define tan _tan #endif #endif // _CONFIG_H diff --git a/include/win32/resources/resource.h b/include/win32/resources/resource.h index e91d563..2a177f0 100644 --- a/include/win32/resources/resource.h +++ b/include/win32/resources/resource.h @@ -36,10 +36,10 @@ // Next default values for new objects // #ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 115 -#define _APS_NEXT_COMMAND_VALUE 40001 -#define _APS_NEXT_CONTROL_VALUE 1001 -#define _APS_NEXT_SYMED_VALUE 101 -#endif +# ifndef APSTUDIO_READONLY_SYMBOLS +# define _APS_NEXT_RESOURCE_VALUE 115 +# define _APS_NEXT_COMMAND_VALUE 40001 +# define _APS_NEXT_CONTROL_VALUE 1001 +# define _APS_NEXT_SYMED_VALUE 101 +# endif #endif diff --git a/include/win32/vc/config.h b/include/win32/vc/config.h index f0f90ea..e6696c3 100644 --- a/include/win32/vc/config.h +++ b/include/win32/vc/config.h @@ -294,26 +294,26 @@ #define strncasecmp(s1, s2, n) strnicmp((s1), (s2), (n)) #ifdef HAVE_3DNOW_ASM -# define atan _atan -# define atan2 _atan2 -# define acos _acos -# define asin _asin -# define log _log -# define log10 _log10 -# define pow _pow -# define exp _exp -# define sqrt _sqrt -# define fabs _fabs -# define ceil _ceil -# define floor _floor -# define frexp _frexp -# define ldexp _ldexp -# define modf _modf -# define fmod _fmod -# define sincos _sincos -# define sin _sin -# define cos _cos -# define tan _tan +# define atan _atan +# define atan2 _atan2 +# define acos _acos +# define asin _asin +# define log _log +# define log10 _log10 +# define pow _pow +# define exp _exp +# define sqrt _sqrt +# define fabs _fabs +# define ceil _ceil +# define floor _floor +# define frexp _frexp +# define ldexp _ldexp +# define modf _modf +# define fmod _fmod +# define sincos _sincos +# define sin _sin +# define cos _cos +# define tan _tan #endif #endif // _CONFIG_H diff --git a/include/winquake.h b/include/winquake.h index 2166590..f1c5a56 100644 --- a/include/winquake.h +++ b/include/winquake.h @@ -38,6 +38,7 @@ #include #include #include + #ifdef HAVE_MGRAPH_H # include #endif diff --git a/source/cd_sdl.c b/source/cd_sdl.c index 16758f3..55afa0e 100644 --- a/source/cd_sdl.c +++ b/source/cd_sdl.c @@ -28,15 +28,14 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif - #ifdef HAVE_WINDOWS_H # include #endif #ifdef HAVE_STRING_H -#include +# include #endif #ifdef HAVE_STRINGS_H -#include +# include #endif #include diff --git a/source/cd_win.c b/source/cd_win.c index e25b776..d5c1646 100644 --- a/source/cd_win.c +++ b/source/cd_win.c @@ -29,6 +29,7 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif + #include #include "cdaudio.h" diff --git a/source/checksum.c b/source/checksum.c index 6d6727f..a5644a0 100644 --- a/source/checksum.c +++ b/source/checksum.c @@ -29,12 +29,11 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif - #ifdef HAVE_STRING_H -#include +# include #endif #ifdef HAVE_STRINGS_H -#include +# include #endif #include "checksum.h" diff --git a/source/cl_cam.c b/source/cl_cam.c index 830cb82..6a66f84 100644 --- a/source/cl_cam.c +++ b/source/cl_cam.c @@ -34,15 +34,15 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif - -#include #ifdef HAVE_STRING_H -#include +# include #endif #ifdef HAVE_STRINGS_H -#include +# include #endif +#include + #include "cl_cam.h" #include "client.h" #include "commdef.h" diff --git a/source/cl_cmd.c b/source/cl_cmd.c index 79cffae..9166b17 100644 --- a/source/cl_cmd.c +++ b/source/cl_cmd.c @@ -29,12 +29,11 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif - #ifdef HAVE_STRING_H -#include +# include #endif #ifdef HAVE_STRINGS_H -#include +# include #endif #include "client.h" diff --git a/source/cl_slist.c b/source/cl_slist.c index 577772c..b04d35d 100644 --- a/source/cl_slist.c +++ b/source/cl_slist.c @@ -32,18 +32,17 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif - #ifdef HAVE_STRING_H -#include +# include #endif #ifdef HAVE_STRINGS_H -#include +# include #endif #ifdef HAVE_SYS_TIME_H -#include +# include #endif #ifdef HAVE_UNISTD_H -#include +# include #endif #include "bothdefs.h" diff --git a/source/cl_sys_sdl.c b/source/cl_sys_sdl.c index 0cef04e..6109ae1 100644 --- a/source/cl_sys_sdl.c +++ b/source/cl_sys_sdl.c @@ -42,15 +42,15 @@ #include #ifndef _WIN32 -#include -#include -#include -#include -#include -#include -#include -#include -#include +# include +# include +# include +# include +# include +# include +# include +# include +# include #endif #include diff --git a/source/cl_sys_win.c b/source/cl_sys_win.c index fc4ed0e..542c863 100644 --- a/source/cl_sys_win.c +++ b/source/cl_sys_win.c @@ -29,6 +29,7 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif + #include #include #include diff --git a/source/cl_tent.c b/source/cl_tent.c index 3b8e886..47540ab 100644 --- a/source/cl_tent.c +++ b/source/cl_tent.c @@ -29,15 +29,15 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif +#ifdef HAVE_STRING_H +# include +#endif +#ifdef HAVE_STRINGS_H +# include +#endif #include #include -#ifdef HAVE_STRING_H -#include -#endif -#ifdef HAVE_STRINGS_H -#include -#endif #include "cl_ents.h" #include "cl_main.h" diff --git a/source/cmd.c b/source/cmd.c index 24d6d45..444d7e9 100644 --- a/source/cmd.c +++ b/source/cmd.c @@ -29,15 +29,15 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif - -#include #ifdef HAVE_STRING_H -#include +# include #endif #ifdef HAVE_STRINGS_H -#include +# include #endif +#include + #include "cvar.h" #include "cmd.h" #include "console.h" diff --git a/source/console.c b/source/console.c index 3996e0c..73d5532 100644 --- a/source/console.c +++ b/source/console.c @@ -29,17 +29,15 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif - -#include - #ifdef HAVE_STRING_H # include #endif - #ifdef HAVE_STRINGS_H # include #endif +#include + #include "client.h" #include "cmd.h" #include "commdef.h" diff --git a/source/context_x11.c b/source/context_x11.c index c37f4ca..b5d7110 100644 --- a/source/context_x11.c +++ b/source/context_x11.c @@ -29,14 +29,18 @@ $Id$ */ +#ifdef HAVE_CONFIG_H # include "config.h" +#endif #include #include #include + #ifdef HAVE_UNISTD_H -#include +# include #endif + #include #include #include diff --git a/source/cvar.c b/source/cvar.c index 7a5a1ea..1a1697a 100644 --- a/source/cvar.c +++ b/source/cvar.c @@ -32,15 +32,15 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif +#ifdef HAVE_STRING_H +# include +#endif +#ifdef HAVE_STRINGS_H +# include +#endif #include #include -#ifdef HAVE_STRING_H -#include -#endif -#ifdef HAVE_STRINGS_H -#include -#endif #include "commdef.h" #include "cvar.h" diff --git a/source/d_surf.c b/source/d_surf.c index 60f4f5e..a70eeb9 100644 --- a/source/d_surf.c +++ b/source/d_surf.c @@ -30,13 +30,13 @@ # include "config.h" #endif +#include + #include "d_local.h" #include "qargs.h" #include "r_local.h" #include "sys.h" -#include - float surfscale; qboolean r_cache_thrash; // set if surface cache is thrashing diff --git a/source/dga_check.c b/source/dga_check.c index d8fdbdd..ef911ad 100644 --- a/source/dga_check.c +++ b/source/dga_check.c @@ -36,10 +36,10 @@ #include #ifdef HAVE_DGA -#include +# include #endif #ifdef HAVE_VIDMODE -#include +# include #endif #include "dga_check.h" diff --git a/source/draw.c b/source/draw.c index 3ad0d80..77b40f8 100644 --- a/source/draw.c +++ b/source/draw.c @@ -29,12 +29,11 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif - #ifdef HAVE_STRING_H -#include +# include #endif #ifdef HAVE_STRINGS_H -#include +# include #endif #include "client.h" diff --git a/source/fnmatch.c b/source/fnmatch.c index 7a8fbb3..2229c01 100644 --- a/source/fnmatch.c +++ b/source/fnmatch.c @@ -26,10 +26,12 @@ $Id$ */ +#ifdef HAVE_CONFIG_H # include "config.h" +#endif #ifndef _GNU_SOURCE -#define _GNU_SOURCE +# define _GNU_SOURCE #endif #include diff --git a/source/fractalnoise.c b/source/fractalnoise.c index 67b250b..4158e74 100644 --- a/source/fractalnoise.c +++ b/source/fractalnoise.c @@ -1,7 +1,7 @@ /* fractalnoise.c - LordHavocs fractial noise generator. + LordHavocs fractal noise generator. Copyright (C) 2000 Forest `LordHavoc` Hale. diff --git a/source/gl_mesh.c b/source/gl_mesh.c index 06b38bf..f2e9343 100644 --- a/source/gl_mesh.c +++ b/source/gl_mesh.c @@ -29,13 +29,13 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif - #ifdef HAVE_STRING_H -#include +# include #endif #ifdef HAVE_STRINGS_H -#include +# include #endif + #include #include "console.h" diff --git a/source/gl_rsurf.c b/source/gl_rsurf.c index 0ad796a..d11bbc3 100644 --- a/source/gl_rsurf.c +++ b/source/gl_rsurf.c @@ -30,15 +30,15 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif - -#include #ifdef HAVE_STRING_H -#include +# include #endif #ifdef HAVE_STRINGS_H -#include +# include #endif + #include +#include #include "glquake.h" #include "sys.h" diff --git a/source/in_fbdev.c b/source/in_fbdev.c index cca5188..1c867b1 100644 --- a/source/in_fbdev.c +++ b/source/in_fbdev.c @@ -30,19 +30,16 @@ # include "config.h" #endif +#include +#include +#include + #include "protocol.h" #include "cvar.h" #include "keys.h" -#include -#include - cvar_t *_windowed_mouse; -#include -#include -#include - int fd_blocking (int fd, int on) { diff --git a/source/in_sdl.c b/source/in_sdl.c index ffbc913..e11c866 100644 --- a/source/in_sdl.c +++ b/source/in_sdl.c @@ -50,7 +50,7 @@ #ifdef WIN32 // fixme: this is evil... -#include +# include HWND mainwindow; #endif diff --git a/source/in_svgalib.c b/source/in_svgalib.c index 5ea6339..47b77ca 100644 --- a/source/in_svgalib.c +++ b/source/in_svgalib.c @@ -32,13 +32,12 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif +#ifdef HAVE_UNISTD_H +# include +#endif #include #include -#ifdef HAVE_UNISTD_H -#include -#endif - #include #include #include diff --git a/source/in_win.c b/source/in_win.c index dec5319..e98d3bb 100644 --- a/source/in_win.c +++ b/source/in_win.c @@ -42,7 +42,6 @@ #include "input.h" #include "cl_input.h" #include "view.h" -//#include "dosisms.h" #include "host.h" #define DINPUT_BUFFERSIZE 16 diff --git a/source/in_x11.c b/source/in_x11.c index 8036300..7092df9 100644 --- a/source/in_x11.c +++ b/source/in_x11.c @@ -32,30 +32,27 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif +#ifdef HAVE_STRING_H +# include +#endif +#ifdef HAVE_STRINGS_H +# include +#endif +#ifdef HAVE_UNISTD_H +# include +#endif #define _BSD #include #include #include #include - -#ifdef HAVE_STRING_H -#include -#endif -#ifdef HAVE_STRINGS_H -#include -#endif - -#ifdef HAVE_UNISTD_H -#include -#endif - #include #include #ifdef HAVE_DGA -#include -#include +# include +# include #endif #include "cl_input.h" diff --git a/source/info.c b/source/info.c index ebc57b6..23e9c4e 100644 --- a/source/info.c +++ b/source/info.c @@ -29,15 +29,15 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif +#ifdef HAVE_STRING_H +# include +#endif +#ifdef HAVE_STRINGS_H +# include +#endif #include #include -#ifdef HAVE_STRING_H -#include -#endif -#ifdef HAVE_STRINGS_H -#include -#endif #include "console.h" #include "info.h" diff --git a/source/joy_win.c b/source/joy_win.c index 4076abe..cb62e33 100644 --- a/source/joy_win.c +++ b/source/joy_win.c @@ -32,7 +32,6 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif - #ifdef __MINGW32__ # define INITGUID #endif diff --git a/source/keys.c b/source/keys.c index 27f00f5..f9d0900 100644 --- a/source/keys.c +++ b/source/keys.c @@ -29,19 +29,19 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif - #ifdef _WIN32 -#include +# include #endif -#include -#include #ifdef HAVE_STRING_H -#include +# include #endif #ifdef HAVE_STRINGS_H -#include +# include #endif +#include +#include + #include "client.h" #include "cmd.h" #include "console.h" diff --git a/source/locs.c b/source/locs.c index ff43528..62446aa 100644 --- a/source/locs.c +++ b/source/locs.c @@ -29,15 +29,15 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif - -#include #ifdef HAVE_STRING_H -#include +# include #endif #ifdef HAVE_STRINGS_H -#include +# include #endif +#include + #include "client.h" #include "console.h" #include "locs.h" diff --git a/source/menu.c b/source/menu.c index 691d5da..8d5bb9f 100644 --- a/source/menu.c +++ b/source/menu.c @@ -29,24 +29,23 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif - #ifdef HAVE_SYS_TIME_H -#include +# include #endif #ifdef HAVE_UNISTD_H -#include +# include #endif #ifdef HAVE_NETINET_IN_H -#include +# include #endif #ifdef HAVE_STRING_H -#include +# include #endif #ifdef HAVE_STRINGS_H -#include +# include #endif #ifdef HAVE_WINDOWS_H -#include +# include #endif #include "cl_input.h" diff --git a/source/model_brush.c b/source/model_brush.c index 0a6b023..b10c166 100644 --- a/source/model_brush.c +++ b/source/model_brush.c @@ -32,15 +32,16 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif - -#include #ifdef HAVE_STRING_H -#include +# include #endif #ifdef HAVE_STRINGS_H -#include +# include #endif +#include + + #include "checksum.h" #include "cvar.h" #include "model.h" diff --git a/source/msg.c b/source/msg.c index 3ff50a1..20a0c11 100644 --- a/source/msg.c +++ b/source/msg.c @@ -29,12 +29,11 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif - #ifdef HAVE_STRING_H -#include +# include #endif #ifdef HAVE_STRINGS_H -#include +# include #endif #include "msg.h" diff --git a/source/net_chan.c b/source/net_chan.c index 358e1ee..1ccc4fb 100644 --- a/source/net_chan.c +++ b/source/net_chan.c @@ -35,10 +35,10 @@ # include #endif #ifdef HAVE_STRING_H -#include +# include #endif #ifdef HAVE_STRINGS_H -#include +# include #endif #include diff --git a/source/net_udp.c b/source/net_udp.c index e141cc6..90371c6 100644 --- a/source/net_udp.c +++ b/source/net_udp.c @@ -37,7 +37,7 @@ #include #ifdef HAVE_UNISTD_H -#include +# include #endif #include @@ -65,7 +65,7 @@ #endif #ifdef NeXT -#include +# include #endif #include "console.h" @@ -74,7 +74,7 @@ #include "qargs.h" #ifdef _WIN32 -#include +# include # undef EWOULDBLOCK # define EWOULDBLOCK WSAEWOULDBLOCK #endif @@ -85,9 +85,9 @@ #ifndef HAVE_SOCKLEN_T # ifdef HAVE_SIZE -typedef size_t socklen_t; + typedef size_t socklen_t; # else -typedef unsigned int socklen_t; + typedef unsigned int socklen_t; # endif #endif @@ -103,7 +103,7 @@ extern qboolean is_server; byte net_message_buffer[MAX_UDP_PACKET]; #ifdef _WIN32 -WSADATA winsockdata; + WSADATA winsockdata; #endif //============================================================================= diff --git a/source/net_udp6.c b/source/net_udp6.c index 969415d..0d11f5c 100644 --- a/source/net_udp6.c +++ b/source/net_udp6.c @@ -57,15 +57,16 @@ #endif #ifndef _WIN32 -#include +# include #endif + #include #ifdef HAVE_STRING_H -#include +# include #endif #ifdef HAVE_STRINGS_H -#include +# include #endif #ifdef HAVE_SYS_IOCTL_H # include @@ -89,7 +90,7 @@ #undef model_t #ifdef NeXT -#include +# include #endif #include "console.h" @@ -99,12 +100,12 @@ #include "sys.h" #ifndef MAXHOSTNAMELEN -#define MAXHOSTNAMELEN 512 +# define MAXHOSTNAMELEN 512 #endif #ifdef __GLIBC__ // glibc macro -#define s6_addr32 in6_u.u6_addr32 -#define ss_family __ss_family +# define s6_addr32 in6_u.u6_addr32 +# define ss_family __ss_family #endif netadr_t net_local_adr; @@ -117,7 +118,7 @@ int net_socket; byte net_message_buffer[MAX_UDP_PACKET]; #ifdef _WIN32 -WSADATA winsockdata; + WSADATA winsockdata; #endif //============================================================================= diff --git a/source/pcx.c b/source/pcx.c index 0034ba5..ecc877e 100644 --- a/source/pcx.c +++ b/source/pcx.c @@ -29,12 +29,11 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif - #ifdef HAVE_STRING_H -#include +# include #endif #ifdef HAVE_STRINGS_H -#include +# include #endif #include "cl_parse.h" diff --git a/source/pr_edict.c b/source/pr_edict.c index d3446a3..f2eee87 100644 --- a/source/pr_edict.c +++ b/source/pr_edict.c @@ -29,12 +29,11 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif - #ifdef HAVE_STRING_H -#include +# include #endif #ifdef HAVE_STRINGS_H -#include +# include #endif #include "cmd.h" diff --git a/source/qargs.c b/source/qargs.c index 9e33316..d5321d2 100644 --- a/source/qargs.c +++ b/source/qargs.c @@ -32,13 +32,13 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif - #ifdef HAVE_STRING_H -#include +# include #endif #ifdef HAVE_STRINGS_H -#include +# include #endif + #include #include #include diff --git a/source/qfgl_ext.c b/source/qfgl_ext.c index 51362f4..f4f5857 100644 --- a/source/qfgl_ext.c +++ b/source/qfgl_ext.c @@ -29,7 +29,6 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif - #ifdef HAVE_DLFCN_H # include #endif @@ -59,10 +58,10 @@ #endif #ifdef HAVE_STRING_H -#include +# include #endif #ifdef HAVE_STRINGS_H -#include +# include #endif #include "qfgl_ext.h" diff --git a/source/quakefs.c b/source/quakefs.c index 5a97973..d15972e 100644 --- a/source/quakefs.c +++ b/source/quakefs.c @@ -29,26 +29,19 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif - -#include -#include - #ifdef HAVE_STRING_H # include #endif #ifdef HAVE_STRINGS_H # include #endif - -#include - #ifdef HAVE_UNISTD_H # include #endif -#ifdef HAVE_STRINGS_H -# include -#endif +#include +#include +#include #include #include diff --git a/source/quakeio.c b/source/quakeio.c index 975d921..7249efe 100644 --- a/source/quakeio.c +++ b/source/quakeio.c @@ -31,17 +31,14 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif - #ifdef HAVE_MALLOC_H # include #endif -#include -#include #ifdef HAVE_STRING_H -#include +# include #endif #ifdef HAVE_STRINGS_H -#include +# include #endif #ifdef WIN32 # include @@ -55,6 +52,9 @@ #ifdef _MSC_VER # define _POSIX_ #endif + +#include +#include #include #include "quakefs.h" diff --git a/source/r_sprite.c b/source/r_sprite.c index 07bc02c..6a85c53 100644 --- a/source/r_sprite.c +++ b/source/r_sprite.c @@ -29,13 +29,13 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif - #ifdef HAVE_STRING_H -#include +# include #endif #ifdef HAVE_STRINGS_H -#include +# include #endif + #include #include "console.h" diff --git a/source/sbar.c b/source/sbar.c index 93a9000..8497d77 100644 --- a/source/sbar.c +++ b/source/sbar.c @@ -29,15 +29,15 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif - -#include #ifdef HAVE_STRING_H -#include +# include #endif #ifdef HAVE_STRINGS_H -#include +# include #endif +#include + #include "bothdefs.h" #include "cl_cam.h" #include "client.h" diff --git a/source/screen.c b/source/screen.c index 3922451..f74e916 100644 --- a/source/screen.c +++ b/source/screen.c @@ -29,15 +29,15 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif - -#include #ifdef HAVE_STRING_H -#include +# include #endif #ifdef HAVE_STRINGS_H -#include +# include #endif +#include + #include "cl_parse.h" #include "client.h" #include "cmd.h" diff --git a/source/sizebuf.c b/source/sizebuf.c index b34c7e9..c4857da 100644 --- a/source/sizebuf.c +++ b/source/sizebuf.c @@ -29,12 +29,11 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif - #ifdef HAVE_STRING_H -#include +# include #endif #ifdef HAVE_STRINGS_H -#include +# include #endif #include "console.h" diff --git a/source/snd_alsa_0_5.c b/source/snd_alsa_0_5.c index 40b52b8..0a6bf00 100644 --- a/source/snd_alsa_0_5.c +++ b/source/snd_alsa_0_5.c @@ -30,12 +30,12 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif +#ifdef HAVE_UNISTD_H +# include +#endif #include #include -#ifdef HAVE_UNISTD_H -#include -#endif #include #include #ifdef HAVE_SYS_IOCTL_H diff --git a/source/snd_disk.c b/source/snd_disk.c index 30c3184..1f7c6f6 100644 --- a/source/snd_disk.c +++ b/source/snd_disk.c @@ -30,12 +30,12 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif +#ifdef HAVE_UNISTD_H +# include +#endif #include #include -#ifdef HAVE_UNISTD_H -#include -#endif #include #include diff --git a/source/snd_dma.c b/source/snd_dma.c index ff9f70d..a5022d3 100644 --- a/source/snd_dma.c +++ b/source/snd_dma.c @@ -29,13 +29,13 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif - #ifdef HAVE_STRING_H -#include +# include #endif #ifdef HAVE_STRINGS_H -#include +# include #endif + #include #include "client.h" diff --git a/source/snd_mem.c b/source/snd_mem.c index 2749d73..3cafc21 100644 --- a/source/snd_mem.c +++ b/source/snd_mem.c @@ -29,12 +29,11 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif - #ifdef HAVE_STRING_H -#include +# include #endif #ifdef HAVE_STRINGS_H -#include +# include #endif #include "console.h" diff --git a/source/snd_mix.c b/source/snd_mix.c index 4f4c056..c4748b3 100644 --- a/source/snd_mix.c +++ b/source/snd_mix.c @@ -30,19 +30,19 @@ # include "config.h" #endif #ifdef HAVE_STRING_H -#include +# include #endif #ifdef HAVE_STRINGS_H -#include +# include #endif #include "console.h" #include "sound.h" #ifdef _WIN32 -#include "winquake.h" +# include "winquake.h" #else -#define DWORD unsigned long +# define DWORD unsigned long #endif #define PAINTBUFFER_SIZE 512 diff --git a/source/snd_sdl.c b/source/snd_sdl.c index 98f086d..4bbdc11 100644 --- a/source/snd_sdl.c +++ b/source/snd_sdl.c @@ -29,6 +29,7 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif + #include #include diff --git a/source/snd_sun.c b/source/snd_sun.c index 89bd3bb..f4fa440 100644 --- a/source/snd_sun.c +++ b/source/snd_sun.c @@ -31,10 +31,10 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif - #ifdef HAVE_UNISTD_H -#include +# include #endif + #include #include #include diff --git a/source/sv_ccmds.c b/source/sv_ccmds.c index 419e2a3..4bcf213 100644 --- a/source/sv_ccmds.c +++ b/source/sv_ccmds.c @@ -29,15 +29,15 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif - -#include #ifdef HAVE_STRING_H -#include +# include #endif #ifdef HAVE_STRINGS_H -#include +# include #endif +#include + #include "bothdefs.h" #include "cmd.h" #include "msg.h" diff --git a/source/sv_ents.c b/source/sv_ents.c index 569958a..aaa91bc 100644 --- a/source/sv_ents.c +++ b/source/sv_ents.c @@ -29,12 +29,11 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif - #ifdef HAVE_STRING_H -#include +# include #endif #ifdef HAVE_STRINGS_H -#include +# include #endif #include "msg.h" diff --git a/source/sv_init.c b/source/sv_init.c index 2ca52ca..adc5a51 100644 --- a/source/sv_init.c +++ b/source/sv_init.c @@ -29,12 +29,11 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif - #ifdef HAVE_STRING_H -#include +# include #endif #ifdef HAVE_STRINGS_H -#include +# include #endif #include "crc.h" diff --git a/source/sv_main.c b/source/sv_main.c index 1580fc8..6a2faf2 100644 --- a/source/sv_main.c +++ b/source/sv_main.c @@ -29,16 +29,16 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif - -#include -#include #ifdef HAVE_STRING_H -#include +# include #endif #ifdef HAVE_STRINGS_H # include #endif +#include +#include + #include "bothdefs.h" #include "buildnum.h" #include "cmd.h" diff --git a/source/sv_nchan.c b/source/sv_nchan.c index 0492a16..4266495 100644 --- a/source/sv_nchan.c +++ b/source/sv_nchan.c @@ -30,10 +30,10 @@ # include "config.h" #endif #ifdef HAVE_STRING_H -#include +# include #endif #ifdef HAVE_STRINGS_H -#include +# include #endif #include "msg.h" diff --git a/source/sv_pr_cmds.c b/source/sv_pr_cmds.c index f4446b5..aa5f7ef 100644 --- a/source/sv_pr_cmds.c +++ b/source/sv_pr_cmds.c @@ -29,8 +29,9 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif - -#include +#ifdef HAVE_STRING_H +# include +#endif #include "cmd.h" #include "msg.h" diff --git a/source/sv_send.c b/source/sv_send.c index 6ffa230..f07fd22 100644 --- a/source/sv_send.c +++ b/source/sv_send.c @@ -29,9 +29,11 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif +#ifdef HAVE_STRING_H +# include +#endif #include -#include #include #include diff --git a/source/sv_sys_unix.c b/source/sv_sys_unix.c index 60ac3ce..b363bd6 100644 --- a/source/sv_sys_unix.c +++ b/source/sv_sys_unix.c @@ -30,6 +30,12 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif +#ifdef HAVE_STRING_H +# include +#endif +#ifdef HAVE_STRINGS_H +# include +#endif #include #include @@ -38,12 +44,6 @@ #include #include #include -#ifdef HAVE_STRING_H -#include -#endif -#ifdef HAVE_STRINGS_H -#include -#endif #include "cvar.h" #include "qargs.h" @@ -51,7 +51,7 @@ #include "sys.h" #ifdef NeXT -#include +# include #endif cvar_t *sys_extrasleep; diff --git a/source/teamplay.c b/source/teamplay.c index d8a303e..d8d618d 100644 --- a/source/teamplay.c +++ b/source/teamplay.c @@ -27,15 +27,15 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +# include "config.h" #endif - #ifdef HAVE_STRING_H -#include +# include #endif #ifdef HAVE_STRINGS_H -#include +# include #endif + #include #include "bothdefs.h" diff --git a/source/tga.c b/source/tga.c index 7b799bf..5befde8 100644 --- a/source/tga.c +++ b/source/tga.c @@ -29,12 +29,11 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif - #ifdef HAVE_STRING_H -#include +# include #endif #ifdef HAVE_STRINGS_H -#include +# include #endif #include "qendian.h" diff --git a/source/vid_fbdev.c b/source/vid_fbdev.c index 982d490..234c733 100644 --- a/source/vid_fbdev.c +++ b/source/vid_fbdev.c @@ -39,7 +39,7 @@ #ifdef HAVE_UNISTD_H # include #endif -#if defined(HAVE_SYS_IO_H) +#ifdef HAVE_SYS_IO_H # include #elif defined(HAVE_ASM_IO_H) # include diff --git a/source/vid_sgl.c b/source/vid_sgl.c index 3b06ca3..a0e20d3 100644 --- a/source/vid_sgl.c +++ b/source/vid_sgl.c @@ -51,8 +51,8 @@ #ifdef WIN32 /* fixme: this is evil hack to get full DirectSound support with SDL */ -#include -#include +# include +# include HWND mainwindow; #endif diff --git a/source/vid_win.c b/source/vid_win.c index 51ceaaa..09efd1e 100644 --- a/source/vid_win.c +++ b/source/vid_win.c @@ -29,6 +29,7 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif + #include #include "vid.h" diff --git a/source/world.c b/source/world.c index 8075ba6..3bc4713 100644 --- a/source/world.c +++ b/source/world.c @@ -29,9 +29,6 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif - -#include - #ifdef HAVE_STRING_H # include #endif @@ -39,6 +36,8 @@ # include #endif +#include + #include "commdef.h" #include "console.h" #include "crc.h" diff --git a/source/zone.c b/source/zone.c index 187138a..4106066 100644 --- a/source/zone.c +++ b/source/zone.c @@ -29,9 +29,6 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif - -#include - #ifdef HAVE_STRING_H # include #endif @@ -39,6 +36,8 @@ # include #endif +#include + #include "cmd.h" #include "console.h" #include "qargs.h"