diff options
| author | Adam Moss <moss@lindenlab.com> | 2009-03-09 23:42:07 +0000 |
|---|---|---|
| committer | Adam Moss <moss@lindenlab.com> | 2009-03-09 23:42:07 +0000 |
| commit | 7573288ab3ede23f97bff2f5caefcb622e7e9842 (patch) | |
| tree | 1429e7d758e282e123d31a21246603d0b9814273 /indra/llcommon/llapp.cpp | |
| parent | 2d60d45aead0b49787fb8ad8b5a03614fe17c170 (diff) | |
svn merge -r113780:113785
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/gst3-t113732
QAR-1333 linux gstreamer compatibility improvements and ADD_BUILD_TEST
improvements - combo merge
Diffstat (limited to 'indra/llcommon/llapp.cpp')
| -rw-r--r-- | indra/llcommon/llapp.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/llcommon/llapp.cpp b/indra/llcommon/llapp.cpp index 998b47450d..199315f34e 100644 --- a/indra/llcommon/llapp.cpp +++ b/indra/llcommon/llapp.cpp @@ -58,7 +58,7 @@ void default_unix_signal_handler(int signum, siginfo_t *info, void *); /* OSX doesn't support SIGRT* */ S32 LL_SMACKDOWN_SIGNAL = SIGUSR1; S32 LL_HEARTBEAT_SIGNAL = SIGUSR2; -# else +# else // linux or (assumed) other similar unixoid /* We want reliable delivery of our signals - SIGRT* is it. */ /* Old LinuxThreads versions eat SIGRTMIN+0 to SIGRTMIN+2, avoid those. */ /* Note that SIGRTMIN/SIGRTMAX may expand to a glibc function call with a @@ -559,7 +559,9 @@ void setup_signals() sigaction(LL_SMACKDOWN_SIGNAL, &act, NULL); // Asynchronous signals that are normally ignored +#ifndef LL_IGNORE_SIGCHLD sigaction(SIGCHLD, &act, NULL); +#endif // LL_IGNORE_SIGCHLD sigaction(SIGUSR2, &act, NULL); // Asynchronous signals that result in attempted graceful exit @@ -593,7 +595,9 @@ void clear_signals() sigaction(LL_SMACKDOWN_SIGNAL, &act, NULL); // Asynchronous signals that are normally ignored +#ifndef LL_IGNORE_SIGCHLD sigaction(SIGCHLD, &act, NULL); +#endif // LL_IGNORE_SIGCHLD // Asynchronous signals that result in attempted graceful exit sigaction(SIGHUP, &act, NULL); |