summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2016-03-08 10:20:02 +0200
committerTor Lillqvist <tml@collabora.com>2016-03-08 10:23:04 +0200
commit13e9870bb554d23eef18f327970b1c378bcf7068 (patch)
treecbedb7e7adad19ae1f19d251a703106eee97386f
parent07b3d72efad04e4caa28b3195c5c0bec6e5bd833 (diff)
Bin a pointless level of macro abstraction
Change-Id: I343844aca956a1ce05c733f60a28d51115574ef8
-rw-r--r--vcl/inc/dbggui.hxx8
-rw-r--r--vcl/source/app/svmain.cxx8
2 files changed, 6 insertions, 10 deletions
diff --git a/vcl/inc/dbggui.hxx b/vcl/inc/dbggui.hxx
index 772f3db4c464..1628d1ceef7e 100644
--- a/vcl/inc/dbggui.hxx
+++ b/vcl/inc/dbggui.hxx
@@ -25,14 +25,6 @@
void DbgGUIInitSolarMutexCheck();
void DbgGUIDeInitSolarMutexCheck();
-#define DBGGUI_INIT_SOLARMUTEXCHECK() DbgGUIInitSolarMutexCheck()
-#define DBGGUI_DEINIT_SOLARMUTEXCHECK() DbgGUIDeInitSolarMutexCheck()
-
-#else
-
-#define DBGGUI_INIT_SOLARMUTEXCHECK()
-#define DBGGUI_DEINIT_SOLARMUTEXCHECK()
-
#endif
#endif // INCLUDED_VCL_INC_DBGGUI_HXX
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index 5fdd2687d013..6ca4c07f704d 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -301,7 +301,9 @@ bool InitVCL()
// Set exception handler
pExceptionHandler = osl_addSignalHandler(VCLExceptionSignal_impl, nullptr);
- DBGGUI_INIT_SOLARMUTEXCHECK();
+#ifdef DBG_UTIL
+ DbgGUIInitSolarMutexCheck();
+#endif
#if OSL_DEBUG_LEVEL > 0
DebugEventInjector::getCreate();
@@ -447,7 +449,9 @@ void DeInitVCL()
}
pSVData->mpDefaultWin.disposeAndClear();
- DBGGUI_DEINIT_SOLARMUTEXCHECK();
+#ifdef DBG_UTIL
+ DbgGUIDeInitSolarMutexCheck();
+#endif
if ( pSVData->mpUnoWrapper )
{