diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2012-02-13 21:34:13 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-02-15 16:19:58 +0200 |
| commit | 5f2a2e2149f26db39efd3e7f2fdca952cfcf65f5 (patch) | |
| tree | 4b49988e22c9a14aa4b497cea4b7773552e33ff9 /sal/textenc | |
| parent | There is no libvclplug_svplo for Android (diff) | |
| download | core-5f2a2e2149f26db39efd3e7f2fdca952cfcf65f5.tar.gz core-5f2a2e2149f26db39efd3e7f2fdca952cfcf65f5.zip | |
Don't bother with a separate libsal_textenc when merging libs
Diffstat (limited to 'sal/textenc')
| -rw-r--r-- | sal/textenc/textenc.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sal/textenc/textenc.cxx b/sal/textenc/textenc.cxx index 8d34920b7e82..b6684928998d 100644 --- a/sal/textenc/textenc.cxx +++ b/sal/textenc/textenc.cxx @@ -364,7 +364,7 @@ static ImplTextEncodingData const aImplJavaUtf8TextEncodingData namespace { -#if defined IOS +#if defined IOS || defined LIBO_MERGELIBS extern "C" ImplTextEncodingData const * sal_getFullTextEncodingData( rtl_TextEncoding); // from tables.cxx in sal_textenc library |