From 12d0d264c41ad48bc55f91bb32ab8b64fe1d268d Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Tue, 5 Aug 2008 21:44:47 +0300 Subject: [PATCH] More natural prototype for vlc_savecancel --- include/vlc_threads.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/include/vlc_threads.h b/include/vlc_threads.h index c2dd3030a8..8796d6ccae 100644 --- a/include/vlc_threads.h +++ b/include/vlc_threads.h @@ -603,16 +603,17 @@ VLC_EXPORT (void, vlc_control_cancel, (int cmd, ...)); * Save the cancellation state and disable cancellation for the calling thread. * This function must be called before entering a piece of code that is not * cancellation-safe. - * @param p_state storage for the previous cancellation state - * @return Nothing, always succeeds. + * @return Previous cancellation state (opaque value). */ -static inline void vlc_savecancel (int *p_state) +static inline int vlc_savecancel (void) { + int state; #if defined (LIBVLC_USE_PTHREAD) - (void) pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, p_state); + (void) pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, &state); #else - vlc_control_cancel (VLC_SAVE_CANCEL, p_state); + vlc_control_cancel (VLC_SAVE_CANCEL, &state); #endif + return state; } /** -- 2.39.5