diff --git a/bridges/prj/d.lst b/bridges/prj/d.lst
index 7988e32ddfdb..fd150b4a70b7 100644
--- a/bridges/prj/d.lst
+++ b/bridges/prj/d.lst
@@ -29,4 +29,5 @@ mkdir: %_DEST%\inc%_EXT%\bridges\java
 ..\%__SRC%\lib\libsunpro5_uno.* %_DEST%\lib%_EXT%\libsunpro5_uno.*
 
 dos: sh -c "if test %OS% = MACOSX; then create-bundle %_DEST%\lib%_EXT%\libgcc2_uno*.dylib; fi"
+dos: sh -c "if test %OS% = MACOSX; then create-bundle %_DEST%\lib%_EXT%\libprot_uno*.dylib; fi"
 dos: sh -c "if test %OS% = MACOSX; then create-bundle %_DEST%\lib%_EXT%\libjava_uno*.dylib; fi"
diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx
index a20934a9aed5..5fc97bf9d33f 100644
--- a/cppu/source/uno/lbenv.cxx
+++ b/cppu/source/uno/lbenv.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: lbenv.cxx,v $
  *
- *  $Revision: 1.11 $
+ *  $Revision: 1.12 $
  *
- *  last change: $Author: dbo $ $Date: 2001-02-01 09:12:44 $
+ *  last change: $Author: pliao $ $Date: 2001-02-07 03:40:08 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -943,12 +943,7 @@ static uno_Environment * initDefaultEnvironment(
         oslModule hMod = ::osl_loadModule( aStr.pData, SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY );
         if (hMod)
         {
-#ifdef MACOSX
-            OUString aSymbolName(
-                rEnvTypeName + OUString( RTL_CONSTASCII_USTRINGPARAM("_uno" UNO_INIT_ENVIRONMENT) ) );
-#else
             OUString aSymbolName( RTL_CONSTASCII_USTRINGPARAM(UNO_INIT_ENVIRONMENT) );
-#endif
             uno_initEnvironmentFunc fpInit =
                 (uno_initEnvironmentFunc)::osl_getSymbol( hMod, aSymbolName.pData );
             if (fpInit)
diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx
index fcc80d1c212c..e63affb5cfa9 100644
--- a/cppu/source/uno/lbmap.cxx
+++ b/cppu/source/uno/lbmap.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: lbmap.cxx,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: mh $ $Date: 2001-01-31 09:36:30 $
+ *  last change: $Author: pliao $ $Date: 2001-02-07 03:40:08 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -398,12 +398,7 @@ static Mapping loadExternalMapping(
 
         if (hModule)
         {
-#ifdef MACOSX
-            OUString aSymbolName(
-                aName + OUString( RTL_CONSTASCII_USTRINGPARAM(UNO_EXT_GETMAPPING) ) );
-#else
             OUString aSymbolName( RTL_CONSTASCII_USTRINGPARAM(UNO_EXT_GETMAPPING) );
-#endif
             uno_ext_getMappingFunc fpGetMapFunc =
                 (uno_ext_getMappingFunc)::osl_getSymbol( hModule, aSymbolName.pData );
 
diff --git a/cppu/test/makefile.mk b/cppu/test/makefile.mk
index 60838c1a571c..4a7259b46666 100644
--- a/cppu/test/makefile.mk
+++ b/cppu/test/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.9 $
+#   $Revision: 1.10 $
 #
-#   last change: $Author: dbo $ $Date: 2001-01-09 12:48:18 $
+#   last change: $Author: pliao $ $Date: 2001-02-07 03:40:09 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -83,8 +83,8 @@ INCPRE+=	$(OUT)$/inc$/test
 
 OBJFILES=	\
         $(OBJ)$/testcppu.obj	\
-        $(OBJ)$/test_di.obj		\
-        $(OBJ)$/test_Cincludes.obj
+        $(OBJ)$/test_di.obj
+#		$(OBJ)$/test_Cincludes.obj
 #		$(OBJ)$/test_sec.obj	\
 
 
diff --git a/sal/osl/unx/module.c b/sal/osl/unx/module.c
index 45a1a8847767..e07454a94d4e 100644
--- a/sal/osl/unx/module.c
+++ b/sal/osl/unx/module.c
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: module.c,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: pliao $ $Date: 2001-02-05 00:44:08 $
+ *  last change: $Author: pliao $ $Date: 2001-02-07 03:40:09 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -268,9 +268,12 @@ oslModule SAL_CALL osl_psz_loadModule(const sal_Char *pszModuleName, sal_Int32 n
 
             if ( pModule )
             {
+                // ignore ".dylib.framework"
+                int len = strlen( pszModuleName ) - 16;
                 pModule->pModule = pLib;
-                pModule->pModuleName = (sal_Char *)malloc( strlen( pszModuleName ) );
-                strcpy( pModule->pModuleName, pszModuleName );
+                pModule->pModuleName = (sal_Char *)malloc( len );
+                strncpy( pModule->pModuleName, pszModuleName, len );
+                pModule->pModuleName[len] = '\0';
             }
 
             return pModule;