fix GLX_USE_TLS breakage, fix a warning

2007-06-12 08:57:12 -06:00
parent 0fbc4c51a0
commit c1ba308e64
1 changed files with 2 additions and 2 deletions
--- 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