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

[Tor Lillqvist]

 idl/source/objects/types.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 93a23d1148381871c4ed15117c9e24cb3780b9f5
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Nov 15 18:08:51 2013 +0200

    No __weak__ in Win32
    
    Change-Id: I3bd5e3787d0f47cfef667734211cdf8c0fd606a7

diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index 642d303..5bdd292 100644
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -1416,7 +1416,7 @@ void SvMetaType::WriteSfxItem(
 
     // write the implementation part
     rOutStm << "#ifdef SFX_TYPEMAP" << endl
-            << "#if defined(DISABLE_DYNLOADING) && (defined(ANDROID) || defined(IOS)) || defined(LIBO_MERGELIBS)" << endl
+            << "#if !defined(_WIN32) && ((defined(DISABLE_DYNLOADING) && (defined(ANDROID) || defined(IOS))) || defined(LIBO_MERGELIBS))" << endl
             << "__attribute__((__weak__))" << endl
             << "#endif" << endl
             << aTypeName.getStr() << aVarName.getStr()