X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmapi%2Fmapi.c;h=c235adc4ab3018ea441823ca812fa075c278553d;hb=6d3b86c3afe4ee1bfb29c322b3d36131139cbab9;hp=6f1b35fa4251fbf744e8e1b4759dcb2e67d99e04;hpb=846a7e86309ab3877af6b7d3a63880468dfacbd3;p=mesa.git

diff --git a/src/mapi/mapi.c b/src/mapi/mapi.c
index 6f1b35fa425..c235adc4ab3 100644
--- a/src/mapi/mapi.c
+++ b/src/mapi/mapi.c
@@ -29,7 +29,6 @@
 #include <string.h>
 
 #include "u_current.h"
-#include "u_thread.h"
 #include "mapi.h"
 #include "stub.h"
 #include "table.h"
@@ -72,15 +71,15 @@ get_stub(const char *name, const struct mapi_stub *alias)
 void
 mapi_init(const char *spec)
 {
-   u_mutex_declare_static(mutex);
+   static mtx_t mutex = _MTX_INITIALIZER_NP;
    const char *p;
    int ver, count;
 
-   u_mutex_lock(mutex);
+   mtx_lock(&mutex);
 
    /* already initialized */
    if (mapi_num_stubs) {
-      u_mutex_unlock(mutex);
+      mtx_unlock(&mutex);
       return;
    }
 
@@ -90,7 +89,7 @@ mapi_init(const char *spec)
    /* parse version string */
    ver = atoi(p);
    if (ver != 1) {
-      u_mutex_unlock(mutex);
+      mtx_unlock(&mutex);
       return;
    }
    p += strlen(p) + 1;
@@ -115,7 +114,7 @@ mapi_init(const char *spec)
 
    mapi_num_stubs = count;
 
-   u_mutex_unlock(mutex);
+   mtx_unlock(&mutex);
 }
 
 /**