[vlc-commits] vlc: use SETMASK instead of BLOCK

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Feb  3 14:56:17 2011 +0200| [86c8ef3fb275c71baed5a1e1c43624c813b1193c] | committer: Rémi Denis-Courmont

vlc: use SETMASK instead of BLOCK

We don't really want to inherit the blocked signal mask from our parent.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=86c8ef3fb275c71baed5a1e1c43624c813b1193c
---

 bin/vlc.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/vlc.c b/bin/vlc.c
index 00da32c..2094cdc 100644
--- a/bin/vlc.c
+++ b/bin/vlc.c
@@ -160,7 +160,7 @@ int main( int i_argc, const char *ppsz_argv[] )
      * Furthermore the handler must not be set to SIG_IGN (see above).
      * We cannot pragmatically handle EINTR, short reads and short writes
      * in every code paths (including underlying libraries). So we just
-     * block SIGCHLD in all threads, and dequeue it with sigwait() below. */
+     * block SIGCHLD in all threads, and dequeue it below. */
     sigaddset (&set, SIGCHLD);
 
 #ifdef HAVE_MAEMO
@@ -171,7 +171,7 @@ int main( int i_argc, const char *ppsz_argv[] )
     }
 #endif
     /* Block all these signals */
-    pthread_sigmask (SIG_BLOCK, &set, NULL);
+    pthread_sigmask (SIG_SETMASK, &set, NULL);
 
     /* Note that FromLocale() can be used before libvlc is initialized */
     const char *argv[i_argc + 4];