X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmapi%2Fmapi_glapi.c;h=1cee148c89158233c36335cf51fc8502619f6218;hb=47cf310a671b75b1552a7b5d8accc8baa8ecdefb;hp=70605f3dfa1df43b3c882a54b880f8b4fb3f5a55;hpb=201e36e77d6ca616f75f14d5f1c31f0062ae4366;p=mesa.git

diff --git a/src/mapi/mapi_glapi.c b/src/mapi/mapi_glapi.c
index 70605f3dfa1..1cee148c891 100644
--- 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++;
-#endif
-
    if (!name || name[0] != 'g' || name[1] != 'l')
       return NULL;
    name += 2;