[Libreoffice-commits] core.git: include/vcl vcl/inc

[Miklos Vajna]

 include/vcl/sysdata.hxx |    2 +-
 vcl/inc/salgdi.hxx      |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e152b756b3558a3619e5bedb6b258cc7f0879e90
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Fri Jun 5 10:47:13 2015 +0200

    vcl: fix Android build
    
    Change-Id: I31724cd56516e6112b66159f722188b228e2eab5

diff --git a/include/vcl/sysdata.hxx b/include/vcl/sysdata.hxx
index 57217df..7a3ee4c 100644
--- a/include/vcl/sysdata.hxx
+++ b/include/vcl/sysdata.hxx
@@ -202,7 +202,7 @@ struct SystemGlyphData
     int                  fallbacklevel;
 };
 
-#if ENABLE_CAIRO_CANVAS
+#if ENABLE_CAIRO_CANVAS || defined(ANDROID)
 
 struct SystemFontData
 {
diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx
index 8c98d08..21095f9 100644
--- a/vcl/inc/salgdi.hxx
+++ b/vcl/inc/salgdi.hxx
@@ -443,7 +443,7 @@ public:
 
     virtual SystemGraphicsData  GetGraphicsData() const = 0;
 
-#if ENABLE_CAIRO_CANVAS
+#if ENABLE_CAIRO_CANVAS || defined(ANDROID)
 
     /// Check whether cairo will work
     virtual bool                SupportsCairo() const = 0;