Don't patch Makefile.in.in, this does not work

[vlc] / include / vlc_threads.h

diff --git a/include/vlc_threads.h b/include/vlc_threads.h
index 760115b8119d5da2e0abc0e3e82a4bf47750e277..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;
 
@@ -165,8 +172,6 @@ enum {
 
 #define vlc_thread_ready vlc_object_signal
 
-VLC_EXPORT(void, vlc_thread_fatal, (const char *action, int error, const char *function, const char *file, unsigned line));
-
 #if defined(LIBVLC_USE_PTHREAD)
 #   define vlc_assert_locked( m ) \
            assert (pthread_mutex_lock (m) == EDEADLK)