diff options
| author | zakk <zakk@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2005-08-31 18:00:00 +0000 |
|---|---|---|
| committer | zakk <zakk@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2005-08-31 18:00:00 +0000 |
| commit | 227d86d227c6951ee2bd98388e7960c479c2b2e6 (patch) | |
| tree | 9a52b67cedd0be176d2b8a8be505a5b178f356b9 /code/unix | |
| parent | 389b14cfcd3855222e0fafbbc40cbb71df595fef (diff) | |
| download | ioquake3-aero-227d86d227c6951ee2bd98388e7960c479c2b2e6.tar.gz ioquake3-aero-227d86d227c6951ee2bd98388e7960c479c2b2e6.zip | |
First diff from Andreas Schneider:
here are gcc4 signedness fixes for latest svn :)
git-svn-id: svn://svn.icculus.org/quake3/trunk@50 edf5b092-35ff-0310-97b2-ce42778d08ea
Diffstat (limited to 'code/unix')
| -rw-r--r-- | code/unix/linux_glimp_sdl.c | 10 | ||||
| -rw-r--r-- | code/unix/unix_net.c | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/code/unix/linux_glimp_sdl.c b/code/unix/linux_glimp_sdl.c index 1202b70..1d679d9 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 cfb984a..7eda309 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; |