diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-07-27 10:13:19 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-07-30 08:58:59 +0200 |
| commit | 9cceba9a928cf3b3447f293020be2fe76c035ed5 (patch) | |
| tree | c3d149661a4eefeb1fc7449da92d9820c44b75c9 | |
| parent | b3d28822a650166bb7ff5759499cd5ce0124f746 (diff) | |
make DBG_TESTSOLARMUTEX available in assert builds
where our QA people are more likely to trigger it
Change-Id: I4ce7c8c72e7e21f2296c0f9cc9f019aaef32ed0b
Reviewed-on: https://gerrit.libreoffice.org/58170
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
| -rw-r--r-- | include/tools/debug.hxx | 4 | ||||
| -rw-r--r-- | tools/source/debug/debug.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/app/svmain.cxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/include/tools/debug.hxx b/include/tools/debug.hxx index 3f5d68a670e4..3fa2d5f9460a 100644 --- a/include/tools/debug.hxx +++ b/include/tools/debug.hxx @@ -35,7 +35,8 @@ standard assert. */ -#ifdef DBG_UTIL +#ifndef NDEBUG +// we want the solar mutex checking to be enabled in the assert-enabled builds that the QA people use typedef void (*DbgTestSolarMutexProc)(); @@ -49,7 +50,6 @@ do \ } while(false) #else -// NO DBG_UTIL #define DBG_TESTSOLARMUTEX() ((void)0) diff --git a/tools/source/debug/debug.cxx b/tools/source/debug/debug.cxx index 220d577be52d..9f32eab3267c 100644 --- a/tools/source/debug/debug.cxx +++ b/tools/source/debug/debug.cxx @@ -45,7 +45,7 @@ #include <cxxabi.h> #endif -#ifdef DBG_UTIL +#ifndef NDEBUG struct DebugData { diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx index c2de4819b541..471abc951ffc 100644 --- a/vcl/source/app/svmain.cxx +++ b/vcl/source/app/svmain.cxx @@ -367,7 +367,7 @@ bool InitVCL() // Set exception handler pExceptionHandler = osl_addSignalHandler(VCLExceptionSignal_impl, nullptr); -#ifdef DBG_UTIL +#ifndef NDEBUG DbgGUIInitSolarMutexCheck(); #endif |