Win32: rework mutex/condition implementation.

[vlc] / include / vlc_threads.h

diff --git a/include/vlc_threads.h b/include/vlc_threads.h
index 3d7a6d93426309cad7216e98bad138bf4e2d54a9..406405e4a20d5e6b020f2358b8207050af65fc2f 100644 (file)
--- a/include/vlc_threads.h
+++ b/include/vlc_threads.h
@@ -109,7 +109,7 @@ typedef pthread_mutex_t vlc_mutex_t;
 typedef pthread_cond_t  vlc_cond_t;
 typedef pthread_key_t   vlc_threadvar_t;
 
-#elif defined( WIN32 ) || defined( UNDER_CE )
+#elif defined( WIN32 )
 typedef struct
 {
     HANDLE handle;
@@ -117,7 +117,14 @@ typedef struct
     void  *data;
 } *vlc_thread_t;
 
-typedef HANDLE  vlc_mutex_t;
+typedef struct
+{
+    CRITICAL_SECTION mutex;
+    LONG             owner;
+    unsigned         recursion;
+    bool             recursive;
+}
+vlc_mutex_t;
 typedef HANDLE  vlc_cond_t;
 typedef DWORD   vlc_threadvar_t;