diff options
| author | Michael Meeks <michael.meeks@novell.com> | 2011-03-24 19:59:03 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@novell.com> | 2011-03-24 19:59:43 +0000 |
| commit | e167ad8cbb3fa1456d8525fd4d970c3a5f8e01b0 (patch) | |
| tree | 87f5f3afbfe51aeee8f546035949442f430039b7 /sal/util | |
| parent | e571d06fa332768fc55e309ac84a76386d8297e4 (diff) | |
merge size-sal-textenc i#70166
Diffstat (limited to 'sal/util')
| -rw-r--r-- | sal/util/makefile.mk | 9 | ||||
| -rwxr-xr-x | sal/util/sal.map | 1 | ||||
| -rw-r--r-- | sal/util/saltextenc.map | 6 |
3 files changed, 16 insertions, 0 deletions
diff --git a/sal/util/makefile.mk b/sal/util/makefile.mk index 42c90ca04661..009a131bd9e8 100644 --- a/sal/util/makefile.mk +++ b/sal/util/makefile.mk @@ -173,6 +173,15 @@ SHL1STDLIBS+=-lgcc .ENDIF .ENDIF +SHL4DEPN+=$(SHL1TARGETN) +SHL4LIBS=$(SLB)$/textenc_tables.lib +SHL4TARGET=uno_sal_textenc +SHL4STDLIBS=$(SALLIB) +SHL4VERSIONMAP=saltextenc.map + +SHL4DEF=$(MISC)$/$(SHL4TARGET).def +DEF4NAME=$(SHL4TARGET) + # --- Targets ------------------------------------------------------ .ENDIF # $(header) != "" diff --git a/sal/util/sal.map b/sal/util/sal.map index 73ae4431100e..020e11fbcb57 100755 --- a/sal/util/sal.map +++ b/sal/util/sal.map @@ -553,6 +553,7 @@ UDK_3.5 { UDK_3.6 { # OOo 2.3 global: + osl_loadModuleAscii; osl_getAsciiFunctionSymbol; osl_getModuleHandle; rtl_uString_intern; diff --git a/sal/util/saltextenc.map b/sal/util/saltextenc.map new file mode 100644 index 000000000000..e88a0af15723 --- /dev/null +++ b/sal/util/saltextenc.map @@ -0,0 +1,6 @@ +UDK_3_0_0 { + global: + Impl_getTextEncodingData; + local: + *; +}; |