diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-02-15 16:36:31 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-02-15 16:40:00 +0200 |
| commit | 42422f2599220b678aa41c4aadeec28df113c3ec (patch) | |
| tree | 19bd879d5fde2f6ffc63a1263e7e07221364ec4b /sal/textenc | |
| parent | n#695479: Remove properties when removing empty fly frame (diff) | |
| download | core-42422f2599220b678aa41c4aadeec28df113c3ec.tar.gz core-42422f2599220b678aa41c4aadeec28df113c3ec.zip | |
Merge sal_textenc into sal just on Android
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 b6684928998d..42f1711ecc87 100644 --- a/sal/textenc/textenc.cxx +++ b/sal/textenc/textenc.cxx @@ -364,7 +364,7 @@ static ImplTextEncodingData const aImplJavaUtf8TextEncodingData namespace { -#if defined IOS || defined LIBO_MERGELIBS +#if defined IOS || defined ANDROID extern "C" ImplTextEncodingData const * sal_getFullTextEncodingData( rtl_TextEncoding); // from tables.cxx in sal_textenc library |