[Libreoffice-commits] core.git: vcl/headless

[Miklos Vajna (via logerrit)]

 vcl/headless/svpinst.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 751a89b9d120eccc6c4b53e3b398149f29c79ed9
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Mon Oct 7 10:36:31 2019 +0200
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Mon Oct 7 10:36:31 2019 +0200

    vcl: fix Android build
    
    UNX is defined for Android. Other code in the same file has guards like:
    
            #if !defined(ANDROID) && !defined(IOS)
    
    but this is already in an
    
            #ifndef IOS
    
    block, so just check for ANDROID.
    
    Change-Id: I73f92ef5702ec1f1385e2ffa0ea3dbedf7d3b6a2

diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
index 31b9f4558e44..4687bf1dce4c 100644
--- a/vcl/headless/svpinst.cxx
+++ b/vcl/headless/svpinst.cxx
@@ -247,7 +247,7 @@ std::unique_ptr<SalVirtualDevice> SvpSalInstance::CreateVirtualDevice(SalGraphic
 {
     SvpSalGraphics *pSvpSalGraphics = dynamic_cast<SvpSalGraphics*>(pGraphics);
     assert(pSvpSalGraphics);
-#if defined(UNX)
+#ifndef ANDROID
     // tdf#127529 normally pPreExistingTarget is null and we are a true virtualdevice drawing to a backing buffer.
     // Occasionally, for canvas/slideshow, pPreExistingTarget is pre-provided as a hack to use the vcl drawing
     // apis to render onto a preexisting cairo surface. The necessity for that precedes the use of cairo in vcl proper