[Libreoffice-commits] core.git: vcl/unx
Samuel Mehrbrodt
Samuel.Mehrbrodt at cib.de
Fri Feb 9 16:23:25 UTC 2018
vcl/unx/generic/window/salframe.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 2a43fe2c6357ba15fe65461a4fb5242e20b581e7
Author: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Date: Fri Feb 9 10:04:56 2018 +0100
Fix condition
OSL_DEBUG_LEVEL is always set as it seems
Change-Id: Ie555f705fd13de778463c8073e86d30b3ce09073
Reviewed-on: https://gerrit.libreoffice.org/49476
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index 8f2528c8d4e2..8d925ffb371a 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -702,7 +702,7 @@ void X11SalFrame::Init( SalFrameStyleFlags nSalFrameStyle, SalX11Screen nXScreen
// Hack that out unconditionally for debug builds, as per https://bugzilla.redhat.com/show_bug.cgi?id=981149
// upstream refuses to make this configurable in any way.
// NOTE: You need to use the 'gen' backend for this to work (SAL_USE_VCLPLUGIN=gen)
-#ifndef OSL_DEBUG_LEVEL
+#if OSL_DEBUG_LEVEL < 1
if( pDisplay_->getWMAdaptor()->getAtom( WMAdaptor::NET_WM_PING ) )
a[n++] = pDisplay_->getWMAdaptor()->getAtom( WMAdaptor::NET_WM_PING );
#endif
More information about the Libreoffice-commits
mailing list