summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewermacosx.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2016-12-22 11:16:55 -0500
committerOz Linden <oz@lindenlab.com>2016-12-22 11:16:55 -0500
commitbe69197e0d3af1832a22c6d2475e3e1178a88a31 (patch)
treede9abd1dfc12d6da7e11e385c7dbbb53e631353a /indra/newview/llappviewermacosx.cpp
parent04c7a7a64ac40f471dcec0019a2c7235ad22bd3d (diff)
parente9f5ed6591fb5d2513b5065622b9e7dac6737913 (diff)
merge changes from project trunk
Diffstat (limited to 'indra/newview/llappviewermacosx.cpp')
-rw-r--r--indra/newview/llappviewermacosx.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llappviewermacosx.cpp b/indra/newview/llappviewermacosx.cpp
index 4fe1e31668..bb3bcf2886 100644
--- a/indra/newview/llappviewermacosx.cpp
+++ b/indra/newview/llappviewermacosx.cpp
@@ -260,7 +260,7 @@ bool LLAppViewerMacOSX::restoreErrorTrap()
unsigned int reset_count = 0;
#define SET_SIG(S) sigaction(SIGABRT, &act, &old_act); \
- if((unsigned int)act.sa_sigaction != (unsigned int) old_act.sa_sigaction) \
+ if(act.sa_sigaction != old_act.sa_sigaction) \
++reset_count;
// Synchronous signals
SET_SIG(SIGABRT)