diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-03-26 15:47:28 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-03-26 15:47:28 +0000 |
| commit | e6611cc2ef5960e9f32c56da44fafd02446f53e6 (patch) | |
| tree | 6358ced419ac9412ae39cbb7032f602ff0e7de7c /sal/util | |
| parent | 243a97038bdab8f2ec448df19c88ac2638035531 (diff) | |
MWS_SRX644: migrate branch mws_srx644 -> HEAD
Diffstat (limited to 'sal/util')
| -rw-r--r-- | sal/util/makefile.mk | 21 | ||||
| -rwxr-xr-x | sal/util/sal.map | 6 |
2 files changed, 10 insertions, 17 deletions
diff --git a/sal/util/makefile.mk b/sal/util/makefile.mk index 40379be77f4b..27b383792887 100644 --- a/sal/util/makefile.mk +++ b/sal/util/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.28 $ +# $Revision: 1.29 $ # -# last change: $Author: obo $ $Date: 2002-11-19 10:21:49 $ +# last change: $Author: hr $ $Date: 2003-03-26 16:47:20 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -96,24 +96,18 @@ LIB1TARGET=$(SLB)$/$(TARGET).lib LIB1FILES=$(SLB)$/cpposl.lib $(SLB)$/oslall.lib $(SLB)$/cpprtl.lib .IF "$(GUI)"!="WIN" -LIB1FILES+=$(SLB)$/textenc.lib -.ENDIF -.IF "$(GUI)"=="UNX" -LIB1FILES+=$(SLB)$/systoolsunx.lib +LIB1FILES+=$(SLB)$/textenc.lib .ENDIF LIB3TARGET=$(LB)$/a$(TARGET).lib LIB3ARCHIV=$(LB)$/lib$(TARGET)$(DLLPOSTFIX).a LIB3FILES=$(LB)$/cpposl.lib $(LB)$/oslall.lib $(LB)$/cpprtl.lib -.IF "$(UPDATER)"!="" +#.IF "$(UPDATER)"!="" .IF "$(GUI)"!="WIN" LIB3FILES+=$(LB)$/textenc.lib .ENDIF -.IF "$(GUI)"=="UNX" -LIB3FILES+=$(LB)$/systoolsunx.lib -.ENDIF -.ENDIF +#.ENDIF SHL1TARGET= $(TARGET) SHL1IMPLIB= i$(TARGET) @@ -152,14 +146,11 @@ SHL1STDLIBS+=-init InitLibrary -term ExitLibrary .IF "$(GUI)"=="UNX" .IF "$(OS)"=="SOLARIS" # libposix4.so (SunOS 5.6) -> librt.so (SunOS >= 5.7) -SHL1STDLIBS= -lpthread -lposix4 -lsocket -lnsl -ldl +SHL1STDLIBS= -lnsl -lsocket -lpthread -lposix4 .IF "$(COM)" == "C50" SHL1STDLIBS+= -z allextract -staticlib=Crun -z defaultextract .ENDIF # C50 .ENDIF # SOLARIS -.IF "$(OS)" == "LINUX" -SHL1STDLIBS+= -lstdc++ -.ENDIF .ENDIF # UNX .IF "$(GUI)"=="OS2" diff --git a/sal/util/sal.map b/sal/util/sal.map index 075ebbf3bed5..922c6821f767 100755 --- a/sal/util/sal.map +++ b/sal/util/sal.map @@ -460,7 +460,7 @@ UDK_3_0_0 { rtl_uriDecode; rtl_bootstrap_get; - rtl_bootstrap_set; + rtl_bootstrap_set; rtl_bootstrap_setIniFileName; rtl_bootstrap_args_open; rtl_bootstrap_args_close; @@ -481,7 +481,6 @@ UDK_3_0_0 { rtl_removeUnloadingListener; rtl_logfile_trace; - rtl_tres_state; rtl_tres_create; rtl_tres_destroy; osl_getProcessLocale; @@ -501,4 +500,7 @@ UDK_3.1 { rtl_math_round; rtl_math_stringToDouble; rtl_math_uStringToDouble; + rtl_convertUStringToString; + + osl_joinProcessWithTimeout; } UDK_3_0_0; |