Revert "vcl: fix Android build"

"Cleanup crossplatform cairo" breaks Android and iOS. This reverts commit e152b756.

Revert "vcl: fix Android build"
"Cleanup crossplatform cairo" breaks Android and iOS. This reverts commit e152b756.
0394d49a · Jan Holesovsky · 0b2c324d · 0394d49a · 0394d49a
Kaydet (Commit) 0394d49a authored Haz 05, 2015 tarafından Jan Holesovsky
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

sysdata.hxx include/vcl/sysdata.hxx +1 -1

salgdi.hxx vcl/inc/salgdi.hxx +1 -1

No files found.
--- a/include/vcl/sysdata.hxx
+++ b/include/vcl/sysdata.hxx
@@ -202,7 +202,7 @@ struct SystemGlyphData
    int                  fallbacklevel;
 };

-#if ENABLE_CAIRO_CANVAS || defined(ANDROID)
+#if ENABLE_CAIRO_CANVAS

 struct SystemFontData
 {

--- a/vcl/inc/salgdi.hxx
+++ b/vcl/inc/salgdi.hxx
@@ -443,7 +443,7 @@ public:

    virtual SystemGraphicsData  GetGraphicsData() const = 0;

-#if ENABLE_CAIRO_CANVAS || defined(ANDROID)
+#if ENABLE_CAIRO_CANVAS

    /// Check whether cairo will work
    virtual bool                SupportsCairo() const = 0;