<html><head></head><body>Hi,<br><br>I'm splitting up threads.c so that won't work.<br><br><div class="gmail_quote">Le 7 février 2020 17:02:09 GMT+02:00, Steve Lhomme <robux4@ycbcr.xyz> a écrit :<blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt 0.8ex; border-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;">
<pre class="k9mail">It's only used there and this way we can use the proper type matching the<br>storage.<hr> include/vlc_threads.h | 10 ----------<br> src/misc/threads.c | 17 ++++++++++++++++-<br> 2 files changed, 16 insertions(+), 11 deletions(-)<br><br>diff --git a/include/vlc_threads.h b/include/vlc_threads.h<br>index 7ae25931b72..a5425236b1c 100644<br>--- a/include/vlc_threads.h<br>+++ b/include/vlc_threads.h<br>@@ -1100,16 +1100,6 @@ static inline void vlc_cleanup_lock (void *lock)<br> }<br> #define mutex_cleanup_push( lock ) vlc_cleanup_push (vlc_cleanup_lock, lock)<br> <br>-static inline void vlc_cancel_addr_set(void *addr)<br>-{<br>- vlc_control_cancel(VLC_CANCEL_ADDR_SET, addr);<br>-}<br>-<br>-static inline void vlc_cancel_addr_clear(void *addr)<br>-{<br>- vlc_control_cancel(VLC_CANCEL_ADDR_CLEAR, addr);<br>-}<br>-<br> #ifdef __cplusplus<br> /**<br> * Helper C++ class to lock a mutex.<br>diff --git a/src/misc/threads.c b/src/misc/threads.c<br>index 87c3da03d9e..7699cfae05d 100644<br>--- a/src/misc/threads.c<br>+++ b/src/misc/threads.c<br>@@ -149,11 +149,26 @@ bool vlc_mutex_marked(const vlc_mutex_t *mutex)<br> #if defined(LIBVLC_NEED_SLEEP) || defined(LIBVLC_NEED_CONDVAR)<br> #include <stdatomic.h><br> <br>+static inline void vlc_cancel_addr_set(atomic_int *addr)<br>+{<br>+ vlc_control_cancel(VLC_CANCEL_ADDR_SET, addr);<br>+}<br>+<br>+static inline void vlc_cancel_addr_clear(atomic_int *addr)<br>+{<br>+ vlc_control_cancel(VLC_CANCEL_ADDR_CLEAR, addr);<br>+}<br>+<br>+static void do_vlc_cancel_addr_clear(void *addr)<br>+{<br>+ vlc_cancel_addr_clear(addr);<br>+}<br>+<br> static void vlc_cancel_addr_prepare(atomic_int *addr)<br> {<br> /* Let thread subsystem on address to broadcast for cancellation */<br> vlc_cancel_addr_set(addr);<br>- vlc_cleanup_push(vlc_cancel_addr_clear, addr);<br>+ vlc_cleanup_push(do_vlc_cancel_addr_clear, addr);<br> /* Check if cancellation was pending before vlc_cancel_addr_set() */<br> vlc_testcancel();<br> vlc_cleanup_pop();</pre></blockquote></div><br>-- <br>Envoyé de mon appareil Android avec Courriel K-9 Mail. Veuillez excuser ma brièveté.</body></html>