diff options
| author | Brian <brian.paul@tungstengraphics.com> | 2007-06-12 08:57:12 -0600 |
|---|---|---|
| committer | Brian <brian.paul@tungstengraphics.com> | 2007-06-12 08:57:12 -0600 |
| commit | c1ba308e6499a6eb3f970b81a3f25d63da988d1c (patch) | |
| tree | 2505a8db9bd6d2728ed648e616042b7440229b84 /src | |
| parent | 0fbc4c51a07a5980956d62b3f70c46c65f6c7a57 (diff) | |
| download | external_mesa3d-c1ba308e6499a6eb3f970b81a3f25d63da988d1c.zip external_mesa3d-c1ba308e6499a6eb3f970b81a3f25d63da988d1c.tar.gz external_mesa3d-c1ba308e6499a6eb3f970b81a3f25d63da988d1c.tar.bz2 | |
fix GLX_USE_TLS breakage, fix a warning
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/drivers/x11/glxapi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/x11/glxapi.c b/src/mesa/drivers/x11/glxapi.c index 5f11c90..309a000 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 |