Changeset 9a719ad0af1938ae8978e4e746dc6089eeaab8c6

Timestamp:

05/08/08 21:33:21 (4 months ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1210275201 +0300

git-parent:

[707279b40c386c8a16e1f894db2141a93f647a96]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1210275201 +0300

Message:

Win32 compile fixes

Files:

• include/vlc_common.h (modified) (2 diffs)
• include/vlc_threads.h (modified) (8 diffs)
• src/misc/threads.c (modified) (8 diffs)

include/vlc_common.h

@@ -444 +444 @@
-#endif
-
+#include "vlc_mtime.h"
-#include "vlc_threads.h"
-
@@ -930 +931 @@
-#include "vlc_variables.h"
-#include "vlc_objects.h"
-#include "vlc_mtime.h"
-#include "vlc_modules.h"
-#include "vlc_main.h"

include/vlc_threads.h

@@ -120 +120 @@
-
-#elif defined( WIN32 ) || defined( UNDER_CE )
-
-
-
-
-
-
-
-
-
-
+
-
-typedef BOOL (WINAPI *SIGNALOBJECTANDWAIT) ( HANDLE, HANDLE, DWORD, BOOL );
@@ -212 +203 @@
-
-#elif defined( UNDER_CE )
-VLC_UNUSED( psz_file); VLC_UNUSED( i_line )
+(void)psz_file; (void)i_line
-
-    EnterCriticalSection( &p_mutex->csection );
-
-#elif defined( WIN32 )
-VLC_UNUSED( psz_file); VLC_UNUSED( i_line )
+(void)psz_file; (void)i_line
-
-    WaitForSingleObject( *p_mutex, INFINITE );
@@ -245 +236 @@
-
-#elif defined( UNDER_CE )
-VLC_UNUSED( psz_file); VLC_UNUSED( i_line )
+(void)psz_file); (void)i_line
-
-    LeaveCriticalSection( &p_mutex->csection );
-
-#elif defined( WIN32 )
-VLC_UNUSED( psz_file); VLC_UNUSED( i_line )
+(void)psz_file; (void)i_line
-
-    ReleaseMutex( *p_mutex );
@@ -286 +277 @@
-
-#elif defined( UNDER_CE ) || defined( WIN32 )
-VLC_UNUSED( psz_file); VLC_UNUSED( i_line )
+(void)psz_file; (void)i_line
-
-    /* Release one waiting thread if one is available. */
@@ -344 +335 @@
-
-#elif defined( WIN32 )
-VLC_UNUSED( psz_file); VLC_UNUSED( i_line )
+(void)psz_file; (void)i_line
-
-    /* Increase our wait count */
@@ -393 +384 @@
-#elif defined( UNDER_CE )
-    mtime_t delay_ms = (deadline - mdate())/1000;
-
-    DWORD result;
-    if( delay_ms < 0 )
@@ -409 +399 @@
-       return ETIMEDOUT; /* this error is perfectly normal */
-
+    (void)psz_file; (void)i_line;
+
-#elif defined( WIN32 )
-
-
+
-    DWORD result;
-
-    mtime_t delay_ms = (deadline - mdate())/1000;
-    if( delay_ms < 0 )
-        delay_ms = 0;
@@ -429 +418 @@
-       return ETIMEDOUT; /* this error is perfectly normal */
-
+    (void)psz_file; (void)i_line;
+
-#elif defined( HAVE_KERNEL_SCHEDULER_H )
-#   error Unimplemented

src/misc/threads.c

@@ -384 +384 @@
-#elif defined( WIN32 )
-    *p_tls = TlsAlloc();
-INVALID_HANDLE_VALUE
+TLS_OUT_OF_INDEXES
-#else
-# error Unimplemented!
@@ -451 +451 @@
-         * Knowledge Base, article 104641) */
-#if defined( UNDER_CE )
-        DWORD  threadId;
-        HANDLE hThread = CreateThread( NULL, 0, (LPTHREAD_START_ROUTINE)func,
-
-&threadId
+ 
+                  NULL
-#else
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-    if( !i_ret && i_priority )
-    {
-.hThread
+
-        {
-            msg_Warn( p_this, "couldn't set a faster priority" );
@@ -494 +490 @@
-
-        p_priv->b_thread = true;
-
-
-
-
+
+
-                 psz_file, i_line );
-#else
-        msg_Dbg( p_this, "thread %u (%s) created at priority %d (%s:%d)",
-                 (unsigned int)p_priv->thread_id, psz_name, i_priority,
-                 psz_file, i_line );
-#endif
-    }
-    else
@@ -561 +550 @@
-    VLC_UNUSED( psz_file); VLC_UNUSED( i_line );
-
-.hThread
-.hThread
-.hThread
+
+
+
-    {
-        msg_Warn( p_this, "couldn't set a faster priority" );
@@ -611 +600 @@
-    */
-    if( ! DuplicateHandle(GetCurrentProcess(),
-.hThread
+
-            GetCurrentProcess(),
-            &hThread,
@@ -618 +607 @@
-            DUPLICATE_SAME_ACCESS) )
-    {
-        msg_Err( p_this, "thread_join(%u) failed at %s:%d (%u)",
-                         (unsigned int)p_priv->thread_id.id,
-             psz_file, i_line, (unsigned int)GetLastError() );
-        p_priv->b_thread = false;
-
+
+
-    }
-
-    WaitForSingleObject( hThread, INFINITE );
-
-    msg_Dbg( p_this, "thread %u joined (%s:%d)",
-             (unsigned int)p_priv->thread_id.id,
-             psz_file, i_line );
-#if defined( UNDER_CE )
-    hmodule = GetModuleHandle( _T("COREDLL") );
@@ -666 +650 @@
-    }
-    CloseHandle( hThread );
+error:
-
-#elif defined( HAVE_KERNEL_SCHEDULER_H )
@@ -676 +661 @@
-    {
-        errno = i_ret;
-
-int
+l
+long
-    }
-    else
-
-int
+l
+long
-
-    p_priv->b_thread = false;