From 42422f2599220b678aa41c4aadeec28df113c3ec Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@iki.fi>
Date: Wed, 15 Feb 2012 16:36:31 +0200
Subject: Merge sal_textenc into sal just on Android

---
 sal/textenc/textenc.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sal/textenc')

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
-- 
cgit