threads: unbreak mpv on builds without asserts

Also remove duplicated macro. Fixes: mpv-player#12818 mpv-player#12820
na-na-hi · Nov 6, 2023 · a718677 · a718677
1 parent 84de84b
commit a718677
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/osdep/threads-posix.h b/osdep/threads-posix.h
@@ -122,6 +122,7 @@ static inline int mp_mutex_init_type_internal(mp_mutex *mutex, enum mp_mutex_typ
     pthread_mutexattr_settype(&attr, mutex_type);
     ret = pthread_mutex_init(mutex, &attr);
     pthread_mutexattr_destroy(&attr);
+    assert(!ret);
     return ret;
 }
 

diff --git a/osdep/threads-win32.h b/osdep/threads-win32.h
@@ -51,9 +51,6 @@ static inline int mp_mutex_init_type_internal(mp_mutex *mutex, enum mp_mutex_typ
     return 0;
 }
 
-#define mp_mutex_init_type(mutex, mtype) \
-    assert(!mp_mutex_init_type_internal(mutex, mtype))
-
 static inline int mp_mutex_destroy(mp_mutex *mutex)
 {
     if (mutex->use_cs)

diff --git a/osdep/threads.h b/osdep/threads.h
@@ -12,7 +12,7 @@ enum mp_mutex_type {
     mp_mutex_init_type(mutex, MP_MUTEX_NORMAL)
 
 #define mp_mutex_init_type(mutex, mtype) \
-    assert(!mp_mutex_init_type_internal(mutex, mtype))
+    mp_mutex_init_type_internal(mutex, mtype)
 
 #if HAVE_WIN32_THREADS
 #include "threads-win32.h"