diff options
| author | Ping Liao <pliao@openoffice.org> | 2001-02-07 02:40:09 +0000 |
|---|---|---|
| committer | Ping Liao <pliao@openoffice.org> | 2001-02-07 02:40:09 +0000 |
| commit | 7629ea50fb620d56b03263244f06b47bfbd755e5 (patch) | |
| tree | ae3f957ebcabc6d22b24651e081f39430381b136 /cppu | |
| parent | fa0ab14b471964cfca7268066cb14b420250e696 (diff) | |
Added MACOSX linker/loader bug workaround code.
Diffstat (limited to 'cppu')
| -rw-r--r-- | cppu/source/uno/lbenv.cxx | 9 | ||||
| -rw-r--r-- | cppu/source/uno/lbmap.cxx | 9 | ||||
| -rw-r--r-- | cppu/test/makefile.mk | 8 |
3 files changed, 8 insertions, 18 deletions
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 \ |