diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2019-12-18 10:46:43 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2019-12-18 15:04:12 +0100 |
| commit | fc761cb2cc343c0c0f3ca8a908a547603a029e36 (patch) | |
| tree | b5fda3e85867f6dbec6eca5f0972a42bcc3c8421 /include | |
| parent | f0106e19303a3806a375833e2100538506ccbc0a (diff) | |
tools: define DbgTestSolarMutex() unconditionally
See the discussion at <https://gerrit.libreoffice.org/#/c/58170/>, and
this came up on IRC today again.
The above change broke the invariant that you can mix product and debug
(but not dbgutil) builds. Restore this, without mandating dbgutil for
the solar mutex assert code, which is useful for plain debug builds as
well.
Change-Id: I1f8bdb114b129fc4f39f186ba917e35e346a16b5
Reviewed-on: https://gerrit.libreoffice.org/85369
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/tools/debug.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/tools/debug.hxx b/include/tools/debug.hxx index b66a9b2866ef..c72da4d06887 100644 --- a/include/tools/debug.hxx +++ b/include/tools/debug.hxx @@ -34,14 +34,14 @@ standard assert. */ -#ifndef NDEBUG -// we want the solar mutex checking to be enabled in the assert-enabled builds that the QA people use - typedef void (*DbgTestSolarMutexProc)(); TOOLS_DLLPUBLIC void DbgSetTestSolarMutex( DbgTestSolarMutexProc pParam ); TOOLS_DLLPUBLIC void DbgTestSolarMutex(); +#ifndef NDEBUG +// we want the solar mutex checking to be enabled in the assert-enabled builds that the QA people use + #define DBG_TESTSOLARMUTEX() \ do \ { \ |