From 5f2a2e2149f26db39efd3e7f2fdca952cfcf65f5 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tlillqvist@suse.com>
Date: Mon, 13 Feb 2012 21:34:13 +0200
Subject: Don't bother with a separate libsal_textenc when merging libs

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