playlist: Make playlist_archived_services_discovery_t internal.

[vlc] / include / vlc_threads.h

diff --git a/include/vlc_threads.h b/include/vlc_threads.h
index e36a07cdf08f27c32b21070e7e9c86339a854bfe..911d36b73709dd3c895bfef4a352f6581291395c 100644 (file)
--- a/include/vlc_threads.h
+++ b/include/vlc_threads.h
@@ -29,6 +29,9 @@
   #error You are not libvlc or one of its plugins. You cannot include this file
 #endif
 
+#ifndef _VLC_THREADS_H_
+#define _VLC_THREADS_H_
+
 #include <stdio.h>
 
 #if defined(DEBUG) && defined(HAVE_SYS_TIME_H)
@@ -53,6 +56,7 @@
 
 #elif defined( PTHREAD_COND_T_IN_PTHREAD_H )  /* pthreads (like Linux & BSD) */
 #   define LIBVLC_USE_PTHREAD 1
+#   define _APPLE_C_SOURCE    1 /* Proper pthread semantics on OSX */
 
 #   include <pthread.h>
 #   ifdef DEBUG
@@ -139,6 +143,10 @@ typedef struct
     pth_cond_t cond;
     vlc_object_t * p_this;
 } vlc_cond_t;
+typedef struct
+{
+    int handle;
+} vlc_threadvar_t;
 
 #elif defined( ST_INIT_IN_ST_H )
 typedef st_thread_t      vlc_thread_t;
@@ -152,11 +160,24 @@ typedef struct
     st_cond_t cond;
     vlc_object_t * p_this;
 } vlc_cond_t;
+typedef struct
+{
+    int handle;
+} vlc_threadvar_t;
 
 #elif defined( WIN32 ) || defined( UNDER_CE )
-typedef HANDLE vlc_thread_t;
+typedef struct
+{
+    /* thread id */
+    DWORD  id;
+    /*
+    ** handle to created thread, needs be closed to dispose of it
+    ** even after thread has exited
+    */
+    HANDLE hThread;
+} vlc_thread_t;
+
 typedef BOOL (WINAPI *SIGNALOBJECTANDWAIT) ( HANDLE, HANDLE, DWORD, BOOL );
-typedef unsigned (WINAPI *PTHREAD_START) (void *);
 
 typedef struct
 {
@@ -182,10 +203,15 @@ typedef struct
     vlc_object_t * p_this;
 } vlc_cond_t;
 
+typedef struct
+{
+    DWORD   handle;
+} vlc_threadvar_t;
+
 #elif defined( HAVE_KERNEL_SCHEDULER_H )
 /* This is the BeOS implementation of the vlc threads, note that the mutex is
  * not a real mutex and the cond_var is not like a pthread cond_var but it is
- * enough for what wee need */
+ * enough for what we need */
 
 typedef thread_id vlc_thread_t;
 
@@ -205,6 +231,11 @@ typedef struct
     vlc_object_t * p_this;
 } vlc_cond_t;
 
+typedef struct
+{
+} vlc_threadvar_t;
+
+
 #elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
 typedef pthread_t       vlc_thread_t;
 typedef struct
@@ -218,6 +249,11 @@ typedef struct
     vlc_object_t * p_this;
 } vlc_cond_t;
 
+typedef struct
+{
+    pthread_key_t handle;
+} vlc_threadvar_t;
+
 #elif defined( HAVE_CTHREADS_H )
 typedef cthread_t       vlc_thread_t;
 
@@ -244,5 +280,11 @@ typedef struct
     vlc_object_t * p_this;
 } vlc_cond_t;
 
+typedef struct
+{
+    cthread_key_t handle;
+} vlc_threadvar_t;
+
 #endif
 
+#endif