Qt: simplify volume management

[vlc] / include / vlc_threads.h

diff --git a/include/vlc_threads.h b/include/vlc_threads.h
index fea79bed881804bda61c559977c4c1483ea04f17..3fefbaf2dfbbebffa7821c595a0b30b8123793d4 100644 (file)
--- a/include/vlc_threads.h
+++ b/include/vlc_threads.h
@@ -144,21 +144,20 @@ typedef struct
     HANDLE   handle;
     unsigned clock;
 } vlc_cond_t;
-#define VLC_STATIC_COND { 0, 0, 0 }
+#define VLC_STATIC_COND { 0, 0 }
 
 typedef HANDLE  vlc_sem_t;
 
 typedef struct
 {
     vlc_mutex_t   mutex;
-    vlc_cond_t    read_wait;
-    vlc_cond_t    write_wait;
+    vlc_cond_t    wait;
     unsigned long readers;
     unsigned long writers;
     DWORD         writer;
 } vlc_rwlock_t;
 #define VLC_STATIC_RWLOCK \
-    { VLC_STATIC_MUTEX, VLC_STATIC_COND, VLC_STATIC_COND, 0, 0, 0 }
+    { VLC_STATIC_MUTEX, VLC_STATIC_COND, 0, 0, 0 }
 
 typedef struct vlc_threadvar *vlc_threadvar_t;
 typedef struct vlc_timer *vlc_timer_t;