summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/x11
diff options
context:
space:
mode:
authorBrian <brian@nostromo.localnet.net>2007-01-23 11:46:02 -0700
committerBrian <brian@nostromo.localnet.net>2007-01-23 11:46:02 -0700
commit18d1fdebebcb52e7fcf50e62c4c02862d173af51 (patch)
tree4b1ebe71f1c6e8a45278fcab30dacd4d859896a6 /src/mesa/drivers/x11
parentd46093b8d56f6d89b341d7437c5185ca6be597af (diff)
fixes for C++ warnings/errors
Diffstat (limited to 'src/mesa/drivers/x11')
-rw-r--r--src/mesa/drivers/x11/glxapi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/drivers/x11/glxapi.c b/src/mesa/drivers/x11/glxapi.c
index 7945f1c5b0..973f394045 100644
--- a/src/mesa/drivers/x11/glxapi.c
+++ b/src/mesa/drivers/x11/glxapi.c
@@ -241,7 +241,7 @@ glXGetCurrentContext(void)
#if defined(GLX_USE_TLS)
return CurrentContext;
#elif defined(THREADS)
- return _glthread_GetTSD(&ContextTSD);
+ return (GLXContext) _glthread_GetTSD(&ContextTSD);
#else
return CurrentContext;
#endif