diff options
| author | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2006-01-15 19:15:33 +0000 |
|---|---|---|
| committer | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2006-01-15 19:15:33 +0000 |
| commit | 658430ae6ce481020a841ca2aeabd61010d9bdc0 (patch) | |
| tree | 2573306f82fa45ad8c269b81916673764b3f244a | |
| parent | e280b530ece8aff03c0ad1a25b32ebe50921d4a0 (diff) | |
| download | ioquake3-aero-658430ae6ce481020a841ca2aeabd61010d9bdc0.tar.gz ioquake3-aero-658430ae6ce481020a841ca2aeabd61010d9bdc0.zip | |
* Fix to some warnings in linux_glimp.c
git-svn-id: svn://svn.icculus.org/quake3/trunk@487 edf5b092-35ff-0310-97b2-ce42778d08ea
| -rw-r--r-- | code/unix/linux_glimp.c | 10 | ||||
| -rw-r--r-- | code/unix/sdl_glimp.c | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/code/unix/linux_glimp.c b/code/unix/linux_glimp.c index a72c50a..32eac3f 100644 --- a/code/unix/linux_glimp.c +++ b/code/unix/linux_glimp.c @@ -1175,7 +1175,7 @@ int GLW_SetMode( const char *drivername, int mode, qboolean fullscreen ) qglXMakeCurrent(dpy, win, ctx); // 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) @@ -1499,12 +1499,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/sdl_glimp.c b/code/unix/sdl_glimp.c index b435d8a..75dc010 100644 --- a/code/unix/sdl_glimp.c +++ b/code/unix/sdl_glimp.c @@ -1113,7 +1113,7 @@ qboolean GLimp_SpawnRenderThread( void (*function)( void ) ) warned = qtrue; } -#if !MACOS_X +#ifndef MACOS_X return qfalse; /* better safe than sorry for now. */ #endif |