diff options
| author | Daniel Boelzle <dbo@openoffice.org> | 2000-12-15 09:19:00 +0000 |
|---|---|---|
| committer | Daniel Boelzle <dbo@openoffice.org> | 2000-12-15 09:19:00 +0000 |
| commit | 23e88e8b0944e67a3a78ea473920ab7940a739a6 (patch) | |
| tree | a80b6d09d10c1454ee3fce8f54e3b22ca5c6625a /bridges | |
| parent | b20ea5f50c84884d0255d9f1521e43f05eb27242 (diff) | |
prefixing exports
Diffstat (limited to 'bridges')
| -rw-r--r-- | bridges/source/remote/urp/makefile.mk | 12 | ||||
| -rw-r--r-- | bridges/source/remote/urp/urp_environment.cxx | 10 |
2 files changed, 13 insertions, 9 deletions
diff --git a/bridges/source/remote/urp/makefile.mk b/bridges/source/remote/urp/makefile.mk index e641e67e1563..a0137715ebcc 100644 --- a/bridges/source/remote/urp/makefile.mk +++ b/bridges/source/remote/urp/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.7 $ +# $Revision: 1.8 $ # -# last change: $Author: dbo $ $Date: 2000-12-14 14:41:13 $ +# last change: $Author: dbo $ $Date: 2000-12-15 10:18:59 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -76,7 +76,13 @@ NO_BSYMBOLIC=TRUE # ------------------------------------------------------------------ -CFLAGS += -DBRIDGE_NAME=$(TARGET) +.IF "$(COM)$(OS)" == "GCCMACOSX" +CFLAGS += -D__EXPORT_UNO_INITENVIRONMENT=$(TARGET)uno_initEnvironment \ + -D__EXPORT_UNO_EXT_GETMAPPING=$(TARGET)uno_ext_getMapping +.ELSE +CFLAGS += -D__EXPORT_UNO_INITENVIRONMENT=uno_initEnvironment \ + -D__EXPORT_UNO_EXT_GETMAPPING=uno_ext_getMapping +.ENDIF #CPPUMAKERFLAGS += -C UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb diff --git a/bridges/source/remote/urp/urp_environment.cxx b/bridges/source/remote/urp/urp_environment.cxx index 085cfd1e632d..6762a435413c 100644 --- a/bridges/source/remote/urp/urp_environment.cxx +++ b/bridges/source/remote/urp/urp_environment.cxx @@ -2,9 +2,9 @@ * * $RCSfile: urp_environment.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: dbo $ $Date: 2000-12-14 14:41:13 $ + * last change: $Author: dbo $ $Date: 2000-12-15 10:19:00 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,8 +59,6 @@ * ************************************************************************/ -#include <bridges/export.h> - #include <assert.h> #include <stdio.h> @@ -398,7 +396,7 @@ using namespace bridges_urp; //################################################################################################## -extern "C" SAL_DLLEXPORT void SAL_CALL BRIDGE_EXPORT(uno_initEnvironment)( +extern "C" SAL_DLLEXPORT void SAL_CALL __EXPORT_UNO_INITENVIRONMENT( uno_Environment * pEnvRemote ) { // set C-virtual methods @@ -485,7 +483,7 @@ extern "C" SAL_DLLEXPORT void SAL_CALL BRIDGE_EXPORT(uno_initEnvironment)( //################################################################################################## -extern "C" SAL_DLLEXPORT void SAL_CALL BRIDGE_EXPORT(uno_ext_getMapping)( +extern "C" SAL_DLLEXPORT void SAL_CALL __EXPORT_UNO_EXT_GETMAPPING( uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo ) |