[Libreoffice-commits] .: Branch 'libreoffice-3-4' - patches/dev300

[Petr Mladek]

 patches/dev300/apply                      |    1 -
 patches/dev300/sal-disable-backtrace.diff |   14 --------------
 2 files changed, 15 deletions(-)

New commits:
commit 276209164ccffac16fafa490b3f71c127cfc2a11
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Apr 27 21:08:55 2011 +0200

    pushed sal-disable-backtrace.diff into git

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 3687a54..c65cea2 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1160,7 +1160,6 @@ testing-more-optimizations-ark.diff
 
 # (disabled) debug code extracting SdrOLE streams to some tmp location
 svx-debug-sdrolestreams.diff, thorsten
-sal-disable-backtrace.diff, thorsten
 
 [ MinGW ]
 # build fix for odma - not up-stream
diff --git a/patches/dev300/sal-disable-backtrace.diff b/patches/dev300/sal-disable-backtrace.diff
deleted file mode 100644
index f6ee8ad..0000000
--- a/patches/dev300/sal-disable-backtrace.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- sal/osl/unx/diagnose.c
-+++ sal/osl/unx/diagnose.c
-@@ -248,8 +248,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);