summaryrefslogtreecommitdiff
path: root/hw/xgl
diff options
context:
space:
mode:
authorDavid Reveman <c99drn@cs.umu.se>2005-06-15 05:50:15 +0000
committerDavid Reveman <c99drn@cs.umu.se>2005-06-15 05:50:15 +0000
commitbd54b96034e640f202821eac0a2c40e66c1ddfd0 (patch)
tree880d1b29817c173813bbdce440635ba264132b05 /hw/xgl
parent7fa782dfd548498474830c7268032ffc5fb406a5 (diff)
Shut up compiler
Diffstat (limited to 'hw/xgl')
-rw-r--r--hw/xgl/xglglx.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/hw/xgl/xglglx.c b/hw/xgl/xglglx.c
index 20e2cb098..fe761bdbb 100644
--- a/hw/xgl/xglglx.c
+++ b/hw/xgl/xglglx.c
@@ -1205,15 +1205,15 @@ xglGetString (GLenum name)
case GL_VERSION:
if (!cctx->versionString)
{
- static const char *version = "1.2 (%s)";
- const char *nativeVersion = glGetString (GL_VERSION);
+ static char *version = "1.2 (%s)";
+ char *nativeVersion = (char *) glGetString (GL_VERSION);
cctx->versionString = xalloc (strlen (version) +
strlen (nativeVersion));
if (cctx->versionString)
sprintf (cctx->versionString, version, nativeVersion);
}
- return cctx->versionString;
+ return (GLubyte *) cctx->versionString;
default:
return glGetString (name);
}
@@ -3447,7 +3447,7 @@ xglInitExtensions (xglGLContextPtr pContext)
pContext->glRenderTableEXT = __glNoOpRenderTableEXT;
- extensions = glGetString (GL_EXTENSIONS);
+ extensions = (const char *) glGetString (GL_EXTENSIONS);
if (strstr (extensions, "GL_ARB_multitexture"))
{