From 13229ce11e8d801e4dd40060fd801830095aa59e Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@iki.fi>
Date: Tue, 28 May 2013 16:06:30 +0300
Subject: UNX does not imply X11

We really need some feature test macro that would be equivalent to
using X11.

Change-Id: I0c1f9b487b4feab3b7d4641e898f9fdf0144065b
---
 vcl/source/gdi/gdimtf.cxx | 4 ++--
 1 file 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 ) )
-- 
cgit