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

Tor Lillqvist tml at collabora.com
Sat Dec 6 22:13:33 PST 2014


 vcl/source/window/window.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit b5677f2d962a06f795db18fa264337128664f1fc
Author: Tor Lillqvist <tml at collabora.com>
Date:   Sun Dec 7 08:07:47 2014 +0200

    WaE: 'ANDROID' is not defined, evaluates to 0
    
    'ANDROID' (and UNX, WNT, etc) are either defined or not.
    
    Change-Id: Ia71bd8af23439d97ea2ddd12b8d41990651c1881

diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index e559f70..2ab189b 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -3940,9 +3940,10 @@ Any Window::GetSystemDataAny() const
 
 bool ImplDoTiledRendering()
 {
-#if !HAVE_FEATURE_DESKTOP && !ANDROID
+#if !HAVE_FEATURE_DESKTOP && !defined(ANDROID)
     // We do tiled rendering only for iOS at the moment, actually, but
     // let's see what happens if we assume it for Android, too.
+    // (That comment doesn't match what the code does, does it?)
     return true;
 #else
     // We need some way to know globally if this process will use


More information about the Libreoffice-commits mailing list