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

[Tor Lillqvist]

 patches/dev300/sal-disable-backtrace.diff |   11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

New commits:
commit fae3da7ac622ecdcdb28e626a5097d35802c4510
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Apr 5 12:56:32 2011 +0300

    Make sal-disable-backtrace.diff apply again

diff --git a/patches/dev300/sal-disable-backtrace.diff b/patches/dev300/sal-disable-backtrace.diff
index 994b5ca..f6ee8ad 100644
--- a/patches/dev300/sal-disable-backtrace.diff
+++ b/patches/dev300/sal-disable-backtrace.diff
@@ -1,9 +1,3 @@
----
- sal/osl/unx/diagnose.c |    5 +++--
- 1 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git sal/osl/unx/diagnose.c sal/osl/unx/diagnose.c
-index e98910d..13d977c 100644
 --- sal/osl/unx/diagnose.c
 +++ sal/osl/unx/diagnose.c
 @@ -248,8 +248,9 @@ sal_Bool SAL_CALL osl_assertFailedLine (
@@ -16,8 +10,5 @@ index e98910d..13d977c 100644
 +    if ( !getenv("DISABLE_SAL_BACKTRACE") )
 +        osl_diagnose_backtrace_Impl(f);
  
-     /* release lock and leave, w/o calling osl_breakDebug() */
+     /* release lock and leave */
      pthread_mutex_unlock(&g_mutex);
--- 
-1.7.0.1
-