idl/source/objects/types.cxx | 3 +++
1 file changed, 3 insertions(+)
New commits:
commit b869b73947659c45c1edc5f9cff80bfbe61e52ac
Author: Tor Lillqvist <t...@iki.fi>
Date: Thu Sep 20 14:18:22 2012 +0300
Avoid duplicate symbols when DISABLE_DYNLOADING for Android
Change-Id: Iecd0ed802f6cc715ac77256bb4b49082b5976b4f
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index 9186857..e6cc629 100644
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -1410,6 +1410,9 @@ void SvMetaType::WriteSfxItem(
// write the implementation part
rOutStm << "#ifdef SFX_TYPEMAP" << endl
+ << "#if defined(DISABLE_DYNLOADING) && defined(ANDROID)" << endl
+ << "__attribute__((__weak__))" << endl
+ << "#endif" << endl
<< aTypeName.getStr() << aVarName.getStr()
<< " = " << endl;
rOutStm << '{' << endl
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
