diff options
| author | Adam Moss <moss@lindenlab.com> | 2008-04-16 09:29:07 +0000 |
|---|---|---|
| committer | Adam Moss <moss@lindenlab.com> | 2008-04-16 09:29:07 +0000 |
| commit | fb42741b620cea3d3b6380f1f099c92fcf4f3b04 (patch) | |
| tree | 73c9e027e31810a582dfaeeaae6c51ef7208d6d1 /indra/llcommon/llapp.h | |
| parent | 68988bddebfaf63314ded09e7ec6bade8b7bb951 (diff) | |
QAR-455 Launcher and Heartbeat fixes MergeMe
svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@84853
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/signalcrap-merge1
Diffstat (limited to 'indra/llcommon/llapp.h')
| -rw-r--r-- | indra/llcommon/llapp.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llcommon/llapp.h b/indra/llcommon/llapp.h index d64af62538..c199601c20 100644 --- a/indra/llcommon/llapp.h +++ b/indra/llcommon/llapp.h @@ -46,7 +46,8 @@ typedef void (*LLAppErrorHandler)(); typedef void (*LLAppChildCallback)(int pid, bool exited, int status); #if !LL_WINDOWS -extern const S32 LL_SMACKDOWN_SIGNAL; +extern S32 LL_SMACKDOWN_SIGNAL; +extern S32 LL_HEARTBEAT_SIGNAL; // Clear all of the signal handlers (which we want to do for the child process when we fork void clear_signals(); |