diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-08-03 23:23:13 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-08-03 23:27:13 +0200 |
| commit | dae7245c1ab1e7f09634d32b139cf9997b37fb99 (patch) | |
| tree | 75c44bc1a15eb3d6c078cfe186c2941466f79f19 /sal | |
| parent | 9e74e9f3c0931f34fb5421056851a06b83501ce9 (diff) | |
sal: let DISABLE_SAL_DBGBOX only disable GUI message boxes
If DISABLE_SAL_DBGBOX is set, fall back to printing on stderr.
Change-Id: Id525b4012291b6b29cca7abcaad7483bc6bfba3b
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/osl/unx/diagnose.c | 4 | ||||
| -rw-r--r-- | sal/osl/w32/diagnose.c | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/sal/osl/unx/diagnose.c b/sal/osl/unx/diagnose.c index 5b46a615aa6b..38f11e07896b 100644 --- a/sal/osl/unx/diagnose.c +++ b/sal/osl/unx/diagnose.c @@ -230,10 +230,6 @@ sal_Bool SAL_CALL osl_assertFailedLine ( return sal_False; } - /* if SAL assertions are disabled in general, stop here */ - if ( getenv("DISABLE_SAL_DBGBOX") ) - return doAbort; - /* format message into buffer */ if (pszMessage != 0) { diff --git a/sal/osl/w32/diagnose.c b/sal/osl/w32/diagnose.c index ee39a200063e..3c6b0c9c0cb9 100644 --- a/sal/osl/w32/diagnose.c +++ b/sal/osl/w32/diagnose.c @@ -28,6 +28,8 @@ #include "system.h" +#include <stdio.h> + #include <osl/diagnose.h> static pfunc_osl_printDebugMessage _pPrintDebugMessage = NULL; @@ -119,6 +121,10 @@ sal_Bool SAL_CALL osl_assertFailedLine(const sal_Char* pszFileName, sal_Int32 nL if (nCode == IDCANCEL) return sal_True; /* will cause oslDebugBreak */ } + else + { + fputs(szMessage, stderr); // fall back + } return ( ( env != NULL ) && ( *env != '\0' ) ); } |