diff options
-rw-r--r-- | codemaker/source/cppumaker/makefile.mk | 2 | ||||
-rw-r--r-- | cppu/prj/d.lst | 3 | ||||
-rw-r--r-- | cppu/util/extra.mk | 4 | ||||
-rw-r--r-- | cppu/util/makefile.mk | 4 | ||||
-rw-r--r-- | idlc/source/makefile.mk | 1 | ||||
-rwxr-xr-x | jvmfwk/plugins/sunmajor/javaenvsetup/makefile.mk | 2 | ||||
-rw-r--r-- | jvmfwk/source/makefile.mk | 2 | ||||
-rw-r--r-- | rdbmaker/source/rdbmaker/makefile.mk | 1 | ||||
-rw-r--r-- | registry/tools/makefile.mk | 6 | ||||
-rw-r--r-- | registry/util/makefile.mk | 1 | ||||
-rw-r--r-- | sal/prj/d.lst | 9 | ||||
-rw-r--r-- | sal/rtl/source/strtmpl.c | 2 | ||||
-rw-r--r-- | sal/textenc/convertiso2022cn.c | 4 |
13 files changed, 18 insertions, 23 deletions
diff --git a/codemaker/source/cppumaker/makefile.mk b/codemaker/source/cppumaker/makefile.mk index d1b1fe1ecf88..d349e7f28e71 100644 --- a/codemaker/source/cppumaker/makefile.mk +++ b/codemaker/source/cppumaker/makefile.mk @@ -64,6 +64,6 @@ APP1RPATH=SDK APP1OBJS= $(OBJFILES) APP1DEPN= $(OUT)$/lib$/$(CODEMAKERLIBDEPN) $(OUT)$/lib$/$(COMMONCPPLIBDEPN) -APP1STDLIBS= $(SALLIB) $(SALHELPERLIB) $(REGLIB) $(STORELIB) $(CODEMAKERLIBST) $(COMMONCPPLIBST) +APP1STDLIBS= $(SALLIB) $(SALHELPERLIB) $(REGLIB) $(CODEMAKERLIBST) $(COMMONCPPLIBST) .INCLUDE : target.mk diff --git a/cppu/prj/d.lst b/cppu/prj/d.lst index f019d78ad661..3355b6dc2c52 100644 --- a/cppu/prj/d.lst +++ b/cppu/prj/d.lst @@ -59,7 +59,7 @@ mkdir: %_DEST%\inc%_EXT%\uno ..\%__SRC%\lib\ipurpenvhelper* %_DEST%\lib%_EXT%\* ..\%__SRC%\bin\purpe*.dll %_DEST%\bin%_EXT%\* -..\%__SRC%\lib\libuno_purpenvhelper* %_DEST%\lib%_EXT%\* +..\%__SRC%\lib\libuno_purpenvhelper*.*.* %_DEST%\lib%_EXT%\* ..\%__SRC%\bin\unsafe_u*.dll %_DEST%\bin%_EXT%\* ..\%__SRC%\lib\libunsafe_uno_uno.* %_DEST%\lib%_EXT%\* @@ -68,3 +68,4 @@ mkdir: %_DEST%\inc%_EXT%\uno ..\%__SRC%\lib\libaffine_uno_uno.* %_DEST%\lib%_EXT%\* linklib: libuno_cppu.*.* +linklib: libuno_purpenvhelper*.*.* diff --git a/cppu/util/extra.mk b/cppu/util/extra.mk index cc18523b92b9..dc06e9284e72 100644 --- a/cppu/util/extra.mk +++ b/cppu/util/extra.mk @@ -46,7 +46,7 @@ USE_DEFFILE :=TRUE SHL3TARGET := unsafe_uno_uno SHL3IMPLIB := i$(SHL3TARGET) -SHL3STDLIBS := $(purpenv_helper_LIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) +SHL3STDLIBS := $(purpenv_helper_LIB) $(SALLIB) SHL3OBJS := $(SLO)$/UnsafeBridge.obj .IF "$(GUI)"=="OS2" SHL3VERSIONMAP=unsafe_os2.map @@ -60,7 +60,7 @@ SHL3RPATH := URELIB SHL4TARGET := affine_uno_uno SHL4IMPLIB := i$(SHL4TARGET) -SHL4STDLIBS := $(purpenv_helper_LIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) +SHL4STDLIBS := $(purpenv_helper_LIB) $(SALLIB) SHL4OBJS := $(SLO)$/AffineBridge.obj .IF "$(GUI)"=="OS2" SHL4VERSIONMAP=unsafe_os2.map diff --git a/cppu/util/makefile.mk b/cppu/util/makefile.mk index 8264639311b8..d9c80645d29b 100644 --- a/cppu/util/makefile.mk +++ b/cppu/util/makefile.mk @@ -60,7 +60,7 @@ SHL1TARGET=$(TARGET)$(UDK_MAJOR) SHL1TARGET= uno_$(TARGET) .ENDIF -SHL1STDLIBS = $(SALLIB) $(SALHELPERLIB) +SHL1STDLIBS = $(SALLIB) SHL1DEPN= SHL1IMPLIB=i$(TARGET) @@ -85,7 +85,7 @@ SHL2VERSIONMAP:=$(SHL2TARGET).map .ENDIF # "$(GUI)$(COM)"=="WNTGCC" SHL2DEF := $(MISC)$/$(SHL2TARGET).def SHL2IMPLIB := i$(SHL2TARGET) -SHL2STDLIBS := $(CPPULIB) $(SALHELPERLIB) $(SALLIB) +SHL2STDLIBS := $(CPPULIB) $(SALLIB) SHL2RPATH := URELIB SHL2OBJS := \ $(SLO)$/helper_purpenv_Environment.obj \ diff --git a/idlc/source/makefile.mk b/idlc/source/makefile.mk index 51e1d479b93d..5f7b1d12ade6 100644 --- a/idlc/source/makefile.mk +++ b/idlc/source/makefile.mk @@ -109,7 +109,6 @@ APP1OBJS= $(OBJFILES) APP1RPATH=SDK APP1STDLIBS = \ - $(STORELIB)\ $(REGLIB) \ $(SALLIB) \ $(SALHELPERLIB) diff --git a/jvmfwk/plugins/sunmajor/javaenvsetup/makefile.mk b/jvmfwk/plugins/sunmajor/javaenvsetup/makefile.mk index ef38000bb5d7..29aa95854d33 100755 --- a/jvmfwk/plugins/sunmajor/javaenvsetup/makefile.mk +++ b/jvmfwk/plugins/sunmajor/javaenvsetup/makefile.mk @@ -52,7 +52,7 @@ OBJFILES=$(OBJ)$/javaldx.obj APP1TARGET=javaldx APP1OBJS=$(OBJFILES) -APP1STDLIBS=$(SALLIB) $(CPPULIB) $(CPPUHELPERLIB) $(JVMFWKLIB) $(LIBSTLPORT) $(SALHELPERLIB) +APP1STDLIBS=$(SALLIB) $(JVMFWKLIB) APP1RPATH=UREBIN .ENDIF diff --git a/jvmfwk/source/makefile.mk b/jvmfwk/source/makefile.mk index 876d13db95a7..5b62608a0ad1 100644 --- a/jvmfwk/source/makefile.mk +++ b/jvmfwk/source/makefile.mk @@ -67,7 +67,7 @@ SHL1TARGET = $(FRAMEWORKLIB) SHL1DEPN= SHL1IMPLIB = i$(FRAMEWORKLIB) SHL1LIBS = $(SLB)$/$(TARGET).lib -SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB) $(SALHELPERLIB) $(LIBXML2LIB) $(LIBSTLPORT) +SHL1STDLIBS = $(CPPUHELPERLIB) $(SALLIB) $(LIBXML2LIB) SHL1RPATH = URELIB .IF "$(OS)" == "WNT" diff --git a/rdbmaker/source/rdbmaker/makefile.mk b/rdbmaker/source/rdbmaker/makefile.mk index 03225a6ee2b1..8d29743a5607 100644 --- a/rdbmaker/source/rdbmaker/makefile.mk +++ b/rdbmaker/source/rdbmaker/makefile.mk @@ -53,7 +53,6 @@ APP1TARGET= $(TARGET) APP1OBJS= $(OBJFILES) APP1STDLIBS=\ - $(STORELIB)\ $(SALLIB) \ $(SALHELPERLIB) \ $(REGLIB) \ diff --git a/registry/tools/makefile.mk b/registry/tools/makefile.mk index a97a47a9964e..e4cd82e8679c 100644 --- a/registry/tools/makefile.mk +++ b/registry/tools/makefile.mk @@ -51,9 +51,7 @@ APP1OBJS= $(OBJ)$/regmerge.obj APP1RPATH= UREBIN APP1STDLIBS=\ - $(STORELIB)\ $(SALLIB) \ - $(SALHELPERLIB) \ $(REGLIB) APP2TARGET= regview @@ -61,9 +59,7 @@ APP2OBJS= $(OBJ)$/regview.obj APP2RPATH= UREBIN APP2STDLIBS=\ - $(STORELIB)\ $(SALLIB) \ - $(SALHELPERLIB) \ $(REGLIB) APP3TARGET= regcompare @@ -71,7 +67,6 @@ APP3OBJS= $(OBJ)$/regcompare.obj APP3RPATH= SDK APP3STDLIBS=\ - $(STORELIB)\ $(SALLIB) \ $(SALHELPERLIB) \ $(REGLIB) @@ -80,7 +75,6 @@ APP4TARGET= checksingleton APP4OBJS= $(OBJ)$/checksingleton.obj APP4STDLIBS=\ - $(STORELIB)\ $(SALLIB) \ $(SALHELPERLIB) \ $(REGLIB) diff --git a/registry/util/makefile.mk b/registry/util/makefile.mk index 09590a3a1981..44961787106b 100644 --- a/registry/util/makefile.mk +++ b/registry/util/makefile.mk @@ -60,7 +60,6 @@ SHL1TARGET= $(TARGET) SHL1IMPLIB= ireg SHL1STDLIBS= \ $(SALLIB) \ - $(SALHELPERLIB) \ $(STORELIB) SHL1VERSIONMAP= $(TARGET).map diff --git a/sal/prj/d.lst b/sal/prj/d.lst index 7ba02fb47a06..bcd9c0e2c95a 100644 --- a/sal/prj/d.lst +++ b/sal/prj/d.lst @@ -14,10 +14,13 @@ mkdir: %_DEST%\inc%_EXT%\systools\win32 ..\inc\systools\win32\*.h %_DEST%\inc%_EXT%\systools\win32\*.h ..\inc\systools\win32\*.hxx %_DEST%\inc%_EXT%\systools\win32\*.hxx -..\%__SRC%\lib\lib*.so* %_DEST%\lib%_EXT% +..\%__SRC%\lib\libsalalloc_malloc.so.3 %_DEST%\lib%_EXT%\libsalalloc_malloc.so.3 +symlink: %_DEST%\lib%_EXT%\libsalalloc_malloc.so.3 %_DEST%\lib%_EXT%\libsalalloc_malloc.so +..\%__SRC%\lib\libuno_sal.so.3 %_DEST%\lib%_EXT%\libuno_sal.so.3 +symlink: %_DEST%\lib%_EXT%\libuno_sal.so.3 %_DEST%\lib%_EXT%\libuno_sal.so +..\%__SRC%\lib\libuno_sal.dylib.3 %_DEST%\lib%_EXT%\libuno_sal.dylib.3 +symlink: %_DEST%\lib%_EXT%\libuno_sal.dylib.3 %_DEST%\lib%_EXT%\libuno_sal.dylib ..\%__SRC%\lib\*.sl %_DEST%\lib%_EXT%\*.sl -..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib -..\%__SRC%\lib\*.dylib.* %_DEST%\lib%_EXT%\*.dylib.* ..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a ..\%__SRC%\slb\sal.lib %_DEST%\lib%_EXT%\xsal.lib diff --git a/sal/rtl/source/strtmpl.c b/sal/rtl/source/strtmpl.c index c6277f23348b..99e53dea91a4 100644 --- a/sal/rtl/source/strtmpl.c +++ b/sal/rtl/source/strtmpl.c @@ -276,7 +276,7 @@ sal_Int32 SAL_CALL IMPL_RTL_STRNAME( hashCode_WithLength )( const IMPL_RTL_STRCO { sal_Int32 h = nLen; - if ( nLen < 16 ) + if ( nLen < 256 ) { while ( nLen > 0 ) { diff --git a/sal/textenc/convertiso2022cn.c b/sal/textenc/convertiso2022cn.c index 4ef47783cb90..0f9404d71e96 100644 --- a/sal/textenc/convertiso2022cn.c +++ b/sal/textenc/convertiso2022cn.c @@ -484,8 +484,8 @@ ImplIso2022CnTranslateTo116431(sal_uInt8 const * pCns116431992Data, nPlane = pCns116431992Data[nOffset++]; if (nPlane != 1) return 0; - return (0x20 + pCns116431992Data[nOffset++]) << 8 - | (0x20 + pCns116431992Data[nOffset]); + return (0x20 + pCns116431992Data[nOffset]) << 8 + | (0x20 + pCns116431992Data[nOffset + 1]); } sal_Size ImplConvertUnicodeToIso2022Cn(ImplTextConverterData const * pData, |