merge the formfield patch from ooo-build
[ooovba.git] / applied_patches / 0549-sal-disable-backtrace.diff
blobc17aedbc995df967458785329f231e9fa6f48125
1 diff --git a/sal/osl/unx/diagnose.c b/sal/osl/unx/diagnose.c
2 index c95ed40..57ab708 100644
3 --- sal/osl/unx/diagnose.c
4 +++ sal/osl/unx/diagnose.c
5 @@ -247,8 +247,9 @@ sal_Bool SAL_CALL osl_assertFailedLine (
6 /* output message buffer */
7 OSL_DIAGNOSE_OUTPUTMESSAGE(f, szMessage);
9 - /* output backtrace */
10 - osl_diagnose_backtrace_Impl(f);
11 + /* if SAL backtrace for assertions is disabled, skip here */
12 + if ( !getenv("DISABLE_SAL_BACKTRACE") )
13 + osl_diagnose_backtrace_Impl(f);
15 /* release lock and leave, w/o calling osl_breakDebug() */
16 pthread_mutex_unlock(&g_mutex);