From 06c73f5e595d2b5bc11ec11b35d18d3f56b2ef14 Mon Sep 17 00:00:00 2001 From: Zachary Slater Date: Wed, 31 Aug 2005 18:00:00 +0000 Subject: [PATCH] First diff from Andreas Schneider: here are gcc4 signedness fixes for latest svn :) --- code/botlib/l_precomp.c | 5 +++++ code/client/cl_main.c | 2 +- code/client/cl_net_chan.c | 2 +- code/client/snd_adpcm.c | 4 ++-- code/server/sv_main.c | 2 +- code/unix/linux_glimp_sdl.c | 10 +++++----- code/unix/unix_net.c | 2 +- 7 files changed, 16 insertions(+), 11 deletions(-) diff --git a/code/botlib/l_precomp.c b/code/botlib/l_precomp.c index ae82981b..5122931a 100644 --- a/code/botlib/l_precomp.c +++ b/code/botlib/l_precomp.c @@ -705,7 +705,12 @@ int PC_ExpandBuiltinDefine(source_t *source, token_t *deftoken, define_t *define token_t **firsttoken, token_t **lasttoken) { token_t *token; +#ifdef _WIN32 unsigned long t; // time_t t; //to prevent LCC warning +#else + time_t t; +#endif + char *curtime; token = PC_CopyToken(deftoken); diff --git a/code/client/cl_main.c b/code/client/cl_main.c index 61dbcc73..21075f2d 100644 --- a/code/client/cl_main.c +++ b/code/client/cl_main.c @@ -1543,7 +1543,7 @@ void CL_CheckForResend( void ) { data[10+i] = 0; // NOTE TTimo don't forget to set the right data length! - NET_OutOfBandData( NS_CLIENT, clc.serverAddress, &data[0], i+10 ); + NET_OutOfBandData( NS_CLIENT, clc.serverAddress, (byte *) &data[0], i+10 ); // the most current userinfo has been sent, so watch for any // newer changes to userinfo variables cvar_modifiedFlags &= ~CVAR_USERINFO; diff --git a/code/client/cl_net_chan.c b/code/client/cl_net_chan.c index 904636ed..f18e5651 100644 --- a/code/client/cl_net_chan.c +++ b/code/client/cl_net_chan.c @@ -106,7 +106,7 @@ static void CL_Netchan_Decode( msg_t *msg ) { msg->bit = sbit; msg->readcount = srdc; - string = clc.reliableCommands[ reliableAcknowledge & (MAX_RELIABLE_COMMANDS-1) ]; + string = (byte *) clc.reliableCommands[ reliableAcknowledge & (MAX_RELIABLE_COMMANDS-1) ]; index = 0; // xor the client challenge with the netchan sequence number (need something that changes every message) key = clc.challenge ^ LittleLong( *(unsigned *)msg->data ); diff --git a/code/client/snd_adpcm.c b/code/client/snd_adpcm.c index 3e335fb4..89e68f42 100644 --- a/code/client/snd_adpcm.c +++ b/code/client/snd_adpcm.c @@ -278,7 +278,7 @@ void S_AdpcmGetSamples(sndBuffer *chunk, short *to) { out = (byte *)chunk->sndChunk; // get samples - S_AdpcmDecode( out, to, SND_CHUNK_SIZE_BYTE*2, &state ); + S_AdpcmDecode((char *) out, to, SND_CHUNK_SIZE_BYTE*2, &state ); } @@ -322,7 +322,7 @@ void S_AdpcmEncodeSound( sfx_t *sfx, short *samples ) { out = (byte *)chunk->sndChunk; // encode the samples - S_AdpcmEncode( samples + inOffset, out, n, &state ); + S_AdpcmEncode( samples + inOffset, (char *) out, n, &state ); inOffset += n; count -= n; diff --git a/code/server/sv_main.c b/code/server/sv_main.c index d5b7353c..fa6a4c80 100644 --- a/code/server/sv_main.c +++ b/code/server/sv_main.c @@ -506,7 +506,7 @@ void SV_ConnectionlessPacket( netadr_t from, msg_t *msg ) { MSG_BeginReadingOOB( msg ); MSG_ReadLong( msg ); // skip the -1 marker - if (!Q_strncmp("connect", &msg->data[4], 7)) { + if (!Q_strncmp("connect", (char *) &msg->data[4], 7)) { Huff_Decompress(msg, 12); } diff --git a/code/unix/linux_glimp_sdl.c b/code/unix/linux_glimp_sdl.c index 1202b70c..1d679d9f 100644 --- a/code/unix/linux_glimp_sdl.c +++ b/code/unix/linux_glimp_sdl.c @@ -678,7 +678,7 @@ static int GLW_SetMode( const char *drivername, int mode, qboolean fullscreen ) screen = vidscreen; // bk001130 - from cvs1.17 (mkv) - glstring = qglGetString (GL_RENDERER); + glstring = (char *) qglGetString (GL_RENDERER); ri.Printf( PRINT_ALL, "GL_RENDERER: %s\n", glstring ); // bk010122 - new software token (Indirect) @@ -952,12 +952,12 @@ void GLimp_Init( void ) glConfig.hardwareType = GLHW_GENERIC; // get our config strings - Q_strncpyz( glConfig.vendor_string, qglGetString (GL_VENDOR), sizeof( glConfig.vendor_string ) ); - Q_strncpyz( glConfig.renderer_string, qglGetString (GL_RENDERER), sizeof( glConfig.renderer_string ) ); + Q_strncpyz( glConfig.vendor_string, (char *) qglGetString (GL_VENDOR), sizeof( glConfig.vendor_string ) ); + Q_strncpyz( glConfig.renderer_string, (char *) qglGetString (GL_RENDERER), sizeof( glConfig.renderer_string ) ); if (*glConfig.renderer_string && glConfig.renderer_string[strlen(glConfig.renderer_string) - 1] == '\n') glConfig.renderer_string[strlen(glConfig.renderer_string) - 1] = 0; - Q_strncpyz( glConfig.version_string, qglGetString (GL_VERSION), sizeof( glConfig.version_string ) ); - Q_strncpyz( glConfig.extensions_string, qglGetString (GL_EXTENSIONS), sizeof( glConfig.extensions_string ) ); + Q_strncpyz( glConfig.version_string, (char *) qglGetString (GL_VERSION), sizeof( glConfig.version_string ) ); + Q_strncpyz( glConfig.extensions_string, (char *) qglGetString (GL_EXTENSIONS), sizeof( glConfig.extensions_string ) ); // // chipset specific configuration diff --git a/code/unix/unix_net.c b/code/unix/unix_net.c index cfb984a0..7eda3093 100644 --- a/code/unix/unix_net.c +++ b/code/unix/unix_net.c @@ -159,7 +159,7 @@ qboolean Sys_GetPacket (netadr_t *net_from, msg_t *net_message) { int ret; struct sockaddr_in from; - int fromlen; + socklen_t fromlen; int net_socket; int protocol; int err;