* ./include/*, ./src/*: separated WIN32 #tests and UNDER_CE #tests, because

[vlc] / include / vlc_threads.h

diff --git a/include/vlc_threads.h b/include/vlc_threads.h
index 4a94093984bb470bdb4c6c5ef9ed8db302aa5d92..255eec6fc605de735065121cb58f32cc591165b8 100644 (file)
--- a/include/vlc_threads.h
+++ b/include/vlc_threads.h
@@ -3,7 +3,7 @@
  * This header provides portable declarations for mutexes & conditions
  *****************************************************************************
  * Copyright (C) 1999, 2002 VideoLAN
- * $Id: vlc_threads.h,v 1.17 2002/11/10 18:04:22 sam Exp $
+ * $Id: vlc_threads.h,v 1.18 2002/11/11 14:39:11 sam Exp $
  *
  * Authors: Jean-Marc Dressler <polux@via.ecp.fr>
  *          Samuel Hocevar <sam@via.ecp.fr>
@@ -39,12 +39,10 @@
 #elif defined( ST_INIT_IN_ST_H )                            /* State threads */
 #   include <st.h>
 
-#elif defined( WIN32 )
-#   if defined( UNDER_CE )
+#elif defined( UNDER_CE )
                                                                 /* WinCE API */
-#   else
-#       include <process.h>                                     /* Win32 API */
-#   endif
+#elif defined( WIN32 )
+#   include <process.h>                                         /* Win32 API */
 
 #elif defined( PTHREAD_COND_T_IN_PTHREAD_H )  /* pthreads (like Linux & BSD) */
 #   include <pthread.h>
@@ -80,7 +78,7 @@
 #   define VLC_THREAD_PRIORITY_VIDEO 31
 #   define VLC_THREAD_PRIORITY_OUTPUT 31
 
-#elif defined(WIN32)
+#elif defined(WIN32) || defined(UNDER_CE)
 #   define VLC_THREAD_PRIORITY_LOW 0
 #   define VLC_THREAD_PRIORITY_INPUT THREAD_PRIORITY_TIME_CRITICAL
 #   define VLC_THREAD_PRIORITY_AUDIO THREAD_PRIORITY_HIGHEST
@@ -126,7 +124,7 @@ typedef struct
     vlc_object_t * p_this;
 } vlc_cond_t;
 
-#elif defined( WIN32 )
+#elif defined( WIN32 ) || defined( UNDER_CE )
 typedef HANDLE vlc_thread_t;
 typedef BOOL (WINAPI *SIGNALOBJECTANDWAIT) ( HANDLE, HANDLE, DWORD, BOOL );
 typedef unsigned (__stdcall *PTHREAD_START) (void *);