[Libreoffice-commits] .: vcl/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Sun Jan 6 11:55:41 PST 2013


 vcl/source/gdi/outdev.cxx |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit ea9a321d1229914c6342e032da19f47cbeb9de1b
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sun Jan 6 21:54:18 2013 +0200

    Avoid duplicates not just for iOS but DISABLE_DYNLOADING in general
    
    Change-Id: Ic449e706f4a8c3c2ed06d8602c6e83755441e0da

diff --git a/vcl/source/gdi/outdev.cxx b/vcl/source/gdi/outdev.cxx
index d34cea9..5d91ba3 100644
--- a/vcl/source/gdi/outdev.cxx
+++ b/vcl/source/gdi/outdev.cxx
@@ -65,14 +65,15 @@
 using namespace ::com::sun::star;
 
 DBG_NAME( OutputDevice )
-#ifdef IOS // Static linking, these already exist in the tools
-           // library, so put them in the anonymous namespace here to
-           // avoid clash...
+#ifdef DISABLE_DYNLOADING
+// Linking all needed LO code into one .so/executable, these already
+// exist in the tools library, so put them in the anonymous namespace
+// here to avoid clash...
 namespace {
 #endif
 DBG_NAME( Polygon )
 DBG_NAME( PolyPolygon )
-#ifdef IOS
+#ifdef DISABLE_DYNLOADING
 }
 #endif
 DBG_NAMEEX( Region )


More information about the Libreoffice-commits mailing list