Changeset 0965ae7d651c32b206ed7aa92243d7fa497145c9

Timestamp:

28/08/08 23:03:12 (3 months ago)

Author:

Rémi Denis-Courmont <rdenis@simphalempin.com>

git-committer:

Rémi Denis-Courmont <rdenis@simphalempin.com> 1219957392 +0300

git-parent:

[1014a2aa09d4c4a529407b221676f9138416660b]

git-author:

Rémi Denis-Courmont <rdenis@simphalempin.com> 1219957028 +0300

Message:

vlc_join: check for deadlock

Files:

• include/vlc_threads.h (modified) (1 diff)
• src/misc/threads.c (modified) (2 diffs)

include/vlc_threads.h

@@ -180 +180 @@
-VLC_EXPORT( int, vlc_clone, (vlc_thread_t *, void * (*) (void *), void *, int) );
-VLC_EXPORT( void, vlc_cancel, (vlc_thread_t) );
-int
+void
-VLC_EXPORT (void, vlc_control_cancel, (int cmd, ...));
-

src/misc/threads.c

@@ -622 +622 @@
- * @return 0 on success, a standard error code otherwise.
- */
-
-
-
-
+
+
+
+
+
+
-
-#elif defined( UNDER_CE ) || defined( WIN32 )
@@ -637 +639 @@
-        *result = handle->data;
-    free (handle);
-    return 0;
-
-#elif defined( HAVE_KERNEL_SCHEDULER_H )
-    int32_t exit_value;
-ret
-ret
+int val
+val
-        *result = (void *)exit_value;
-
-    return ret;
-#endif
-}