[Libreoffice-commits] .: Branch 'libreoffice-3-4' - sal/osl

[Petr Mladek]

 sal/osl/unx/diagnose.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit aba11ba22d16a2666f970cd2c3da9b51fd8ed679
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Wed Apr 27 21:06:28 2011 +0200

    sal-disable-backtrace.diff: disable backtrace with DISABLE_SAL_BACKTRACE
    
    allow to disable backtrace when defined the environment variable
    DISABLE_SAL_BACKTRACE

diff --git a/sal/osl/unx/diagnose.c b/sal/osl/unx/diagnose.c
index 30d15ad..041a5e6 100644
--- a/sal/osl/unx/diagnose.c
+++ b/sal/osl/unx/diagnose.c
@@ -255,8 +255,9 @@ sal_Bool SAL_CALL osl_assertFailedLine (
     /* output message buffer */
     OSL_DIAGNOSE_OUTPUTMESSAGE(f, szMessage);
 
-    /* output backtrace */
-    osl_diagnose_backtrace_Impl(f);
+    /* if SAL backtrace for assertions is disabled, skip here */
+    if ( !getenv("DISABLE_SAL_BACKTRACE") )
+        osl_diagnose_backtrace_Impl(f);
 
     /* release lock and leave */
     pthread_mutex_unlock(&g_mutex);