summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2013-05-28 16:06:30 +0300
committerTor Lillqvist <tml@iki.fi>2013-05-28 16:19:03 +0300
commit13229ce11e8d801e4dd40060fd801830095aa59e (patch)
treefca3d8795676742a50a1fc36b1c3eba895fa55d1
parentdaa2ac6e76a4c30a4e2b9a9d0f9d7e351fcb5b5f (diff)
UNX does not imply X11
We really need some feature test macro that would be equivalent to using X11. Change-Id: I0c1f9b487b4feab3b7d4641e898f9fdf0144065b
-rw-r--r--vcl/source/gdi/gdimtf.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index 7ca07e136a5c..ffee7480cda8 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -47,7 +47,7 @@
#include <com/sun/star/graphic/XGraphic.hpp>
#include <com/sun/star/graphic/XGraphicRenderer.hpp>
-#ifdef UNX
+#if defined(UNX) && !defined(ANDROID) && !defined(IOS) && !defined(MACOSX) && !defined(LIBO_HEADLESS)
#include <unx/salbmp.h>
#endif
@@ -450,7 +450,7 @@ bool GDIMetaFile::ImplPlayWithRenderer( OutputDevice* pOut, const Point& rPos, S
// and the commit that changed to the new code relied on alpha support in bitmap
// (which that commit implemented only in X11SalBitmap) and so it didn't work on Windows.
// So keep both.
-#ifdef UNX
+#if defined(UNX) && !defined(ANDROID) && !defined(IOS) && !defined(MACOSX) && !defined(LIBO_HEADLESS)
X11SalBitmap* X11Bmp = static_cast< X11SalBitmap* >( pSalBmp );
X11Bmp->SetHasAlpha( true );
if( X11Bmp->Create( xBitmapCanvas, aSize ) )