X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmapi%2Fu_current.c;h=554c974047745b80a63adaa54809cde149d9d8f3;hb=0dc0a79a581b91aec301991706242f11aeb1473b;hp=1402cea45d5074e3575da1e9441c2f93272c9132;hpb=4562d88c1d6f02b0601abd97f421a72adf64b3a6;p=mesa.git

diff --git a/src/mapi/u_current.c b/src/mapi/u_current.c
index 1402cea45d5..554c9740477 100644
--- a/src/mapi/u_current.c
+++ b/src/mapi/u_current.c
@@ -97,7 +97,7 @@ extern void (*__glapi_noop_table[])(void);
  * between TLS enabled loaders and non-TLS DRI drivers.
  */
 /*@{*/
-#if defined(GLX_USE_TLS)
+#if defined(USE_ELF_TLS)
 
 __thread struct _glapi_table *u_current_table
     __attribute__((tls_model("initial-exec")))
@@ -116,21 +116,21 @@ tss_t u_current_table_tsd;
 static tss_t u_current_context_tsd;
 static int ThreadSafe;
 
-#endif /* defined(GLX_USE_TLS) */
+#endif /* defined(USE_ELF_TLS) */
 /*@}*/
 
 
 void
 u_current_destroy(void)
 {
-#if !defined(GLX_USE_TLS)
+#if !defined(USE_ELF_TLS)
    tss_delete(u_current_table_tsd);
    tss_delete(u_current_context_tsd);
 #endif
 }
 
 
-#if !defined(GLX_USE_TLS)
+#if !defined(USE_ELF_TLS)
 
 static void
 u_current_init_tsd(void)
@@ -230,7 +230,7 @@ u_current_set_context(const void *ptr)
 {
    u_current_init();
 
-#if defined(GLX_USE_TLS)
+#if defined(USE_ELF_TLS)
    u_current_context = (void *) ptr;
 #else
    tss_set(u_current_context_tsd, (void *) ptr);
@@ -246,7 +246,7 @@ u_current_set_context(const void *ptr)
 void *
 u_current_get_context_internal(void)
 {
-#if defined(GLX_USE_TLS)
+#if defined(USE_ELF_TLS)
    return u_current_context;
 #else
    return ThreadSafe ? tss_get(u_current_context_tsd) : u_current_context;
@@ -268,7 +268,7 @@ u_current_set_table(const struct _glapi_table *tbl)
    if (!tbl)
       tbl = (const struct _glapi_table *) table_noop_array;
 
-#if defined(GLX_USE_TLS)
+#if defined(USE_ELF_TLS)
    u_current_table = (struct _glapi_table *) tbl;
 #else
    tss_set(u_current_table_tsd, (void *) tbl);
@@ -282,7 +282,7 @@ u_current_set_table(const struct _glapi_table *tbl)
 struct _glapi_table *
 u_current_get_table_internal(void)
 {
-#if defined(GLX_USE_TLS)
+#if defined(USE_ELF_TLS)
    return u_current_table;
 #else
    if (ThreadSafe)