mesa/glthread: Implement ARB_multi_bind.

[mesa.git] / src / mapi / mapi_glapi.c

diff --git a/src/mapi/mapi_glapi.c b/src/mapi/mapi_glapi.c
index 9f02edb7cd3a9e9ed7d8617e21b8aae1ba3aad97..1cee148c89158233c36335cf51fc8502619f6218 100644 (file)
--- a/src/mapi/mapi_glapi.c
+++ b/src/mapi/mapi_glapi.c
@@ -38,11 +38,11 @@
  * u_current.c.
  */
 
-#ifdef GLX_USE_TLS
+#ifdef USE_ELF_TLS
 /* not used, but defined for compatibility */
 const struct _glapi_table *_glapi_Dispatch;
 const void *_glapi_Context;
-#endif /* GLX_USE_TLS */
+#endif /* USE_ELF_TLS */
 
 void
 _glapi_destroy_multithread(void)
@@ -65,7 +65,7 @@ _glapi_set_context(void *context)
 void
 _glapi_set_dispatch(struct _glapi_table *dispatch)
 {
-   u_current_set_table((const struct mapi_table *) dispatch);
+   u_current_set_table((const struct _glapi_table *) dispatch);
 }
 
 /**
@@ -174,11 +174,6 @@ _glapi_get_stub(const char *name, int generate)
 {
    const struct mapi_stub *stub;
 
-#ifdef USE_MGL_NAMESPACE
-   if (name && name[0] == 'm')
-      name++;
-#endif
-
    if (!name || name[0] != 'g' || name[1] != 'l')
       return NULL;
    name += 2;