summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/x11/glxapi.c
diff options
context:
space:
mode:
authorEric Anholt <[email protected]>2007-06-21 14:14:24 -0700
committerEric Anholt <[email protected]>2007-06-21 14:14:24 -0700
commit4fe48b4e8568896cdbc822323aeec0a41c72ff2a (patch)
treea32edaa514931bad2364b3877302eeaa3847131e /src/mesa/drivers/x11/glxapi.c
parent5d9dc02cbecd94f822f853fd01878784596f4eba (diff)
parented5ed6fe2f64f45eb3a43f9c57037d9e9b7fa5ea (diff)
Merge branch 'origin' into i915-unification
Diffstat (limited to 'src/mesa/drivers/x11/glxapi.c')
-rw-r--r--src/mesa/drivers/x11/glxapi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/x11/glxapi.c b/src/mesa/drivers/x11/glxapi.c
index 5f11c90c13c..309a0008d76 100644
--- a/src/mesa/drivers/x11/glxapi.c
+++ b/src/mesa/drivers/x11/glxapi.c
@@ -141,7 +141,7 @@ static void
SetCurrentContext(GLXContext c)
{
#if defined(GLX_USE_TLS)
- CurrentContext = context;
+ CurrentContext = c;
#elif defined(THREADS)
_glthread_SetTSD(&ContextTSD, c);
#else
@@ -1169,7 +1169,7 @@ _glxapi_get_extensions(void)
#ifdef GLX_SGIX_pbuffer
"GLX_SGIX_pbuffer",
#endif
-#ifdef GLX_EXT_texture_from_pixmap,
+#ifdef GLX_EXT_texture_from_pixmap
"GLX_EXT_texture_from_pixmap",
#endif
NULL