X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmapi%2Fu_thread.h;h=57c3b076af88c8938bfce7327938f235a1028439;hb=1907a3a7ee4d756b12b6fef32a6e5ea7656436d1;hp=3e183589c98263973ffe50a8e201691719326a85;hpb=e8d85034dad37177fce780ee3e09501e60be6e81;p=mesa.git

diff --git a/src/mapi/u_thread.h b/src/mapi/u_thread.h
index 3e183589c98..57c3b076af8 100644
--- a/src/mapi/u_thread.h
+++ b/src/mapi/u_thread.h
@@ -57,9 +57,9 @@
 /*
  * Error messages
  */
-#define INIT_TSD_ERROR "_glthread_: failed to allocate key for thread specific data"
-#define GET_TSD_ERROR "_glthread_: failed to get thread specific data"
-#define SET_TSD_ERROR "_glthread_: thread failed to set thread specific data"
+#define INIT_TSD_ERROR "Mesa: failed to allocate key for thread specific data"
+#define GET_TSD_ERROR "Mesa: failed to get thread specific data"
+#define SET_TSD_ERROR "Mesa: thread failed to set thread specific data"
 
 
 /*
@@ -79,16 +79,6 @@ struct u_tsd {
    unsigned initMagic;
 };
 
-typedef mtx_t u_mutex;
-
-#define u_mutex_declare_static(name) \
-   static u_mutex name = _MTX_INITIALIZER_NP
-
-#define u_mutex_init(name)    mtx_init(&(name), mtx_plain)
-#define u_mutex_destroy(name) mtx_destroy(&(name))
-#define u_mutex_lock(name)    (void) mtx_lock(&(name))
-#define u_mutex_unlock(name)  (void) mtx_unlock(&(name))
-
 
 static INLINE unsigned long
 u_thread_self(void)
@@ -101,8 +91,8 @@ u_thread_self(void)
     * So for now, we side-step this mess and use Windows thread primitives
     * directly here.
     *
-    * FIXME: On the other hand, u_thread_self() and _glthread_GetID() are bad
-    * abstractions.  Even with pthreads, there is no guarantee that
+    * FIXME: On the other hand, u_thread_self() is a bad
+    * abstraction.  Even with pthreads, there is no guarantee that
     * pthread_self() will return numeric IDs -- we should be using
     * pthread_equal() instead of assuming we can compare thread ids...
     */