r487 - trunk/code/unix

[DONOTREPLY at icculus.org]

Author: tma
Date: 2006-01-15 14:15:33 -0500 (Sun, 15 Jan 2006)
New Revision: 487

Modified:
   trunk/code/unix/linux_glimp.c
   trunk/code/unix/sdl_glimp.c
Log:
* Fix to some warnings in linux_glimp.c


Modified: trunk/code/unix/linux_glimp.c
===================================================================
--- trunk/code/unix/linux_glimp.c	2006-01-15 15:45:12 UTC (rev 486)
+++ trunk/code/unix/linux_glimp.c	2006-01-15 19:15:33 UTC (rev 487)
@@ -1175,7 +1175,7 @@
   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 @@
   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

Modified: trunk/code/unix/sdl_glimp.c
===================================================================
--- trunk/code/unix/sdl_glimp.c	2006-01-15 15:45:12 UTC (rev 486)
+++ trunk/code/unix/sdl_glimp.c	2006-01-15 19:15:33 UTC (rev 487)
@@ -1113,7 +1113,7 @@
 		warned = qtrue;
 	}
 
-#if !MACOS_X
+#ifndef MACOS_X
 	return qfalse;  /* better safe than sorry for now. */
 #endif