diff options
| author | Gene Anaya <ganaya@openoffice.org> | 2000-10-10 04:40:16 +0000 |
|---|---|---|
| committer | Gene Anaya <ganaya@openoffice.org> | 2000-10-10 04:40:16 +0000 |
| commit | 8d2eb3f73c252a225611b4a38cddf8b91ad8a760 (patch) | |
| tree | 06f7bcf6871ac46ce004702468f4ba1b4437f5b3 /stoc/source/invocation | |
| parent | 80e77a304e7b4d25496ef82dead027bc0bae2ee8 (diff) | |
Add staticmbinvocation.cxx for macosx
Diffstat (limited to 'stoc/source/invocation')
| -rw-r--r-- | stoc/source/invocation/invocation.cxx | 7 | ||||
| -rw-r--r-- | stoc/source/invocation/makefile.mk | 10 |
2 files changed, 12 insertions, 5 deletions
diff --git a/stoc/source/invocation/invocation.cxx b/stoc/source/invocation/invocation.cxx index a30877d0c91a..d58d9707a8f9 100644 --- a/stoc/source/invocation/invocation.cxx +++ b/stoc/source/invocation/invocation.cxx @@ -2,9 +2,9 @@ * * $RCSfile: invocation.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: dbo $ $Date: 2000-10-06 14:25:13 $ + * last change: $Author: ganaya $ $Date: 2000-10-10 05:40:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -99,8 +99,9 @@ #include <rtl/strbuf.hxx> #include <stdlib.h> +#ifndef MACOSX #include <search.h> - +#endif #define SERVICE_NAME "com.sun.star.script.Invocation" #define IMPL_NAME "com.sun.star.comp.stoc.Invocation" diff --git a/stoc/source/invocation/makefile.mk b/stoc/source/invocation/makefile.mk index 0980f71e65d9..5f8fd420f583 100644 --- a/stoc/source/invocation/makefile.mk +++ b/stoc/source/invocation/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.1.1.1 $ +# $Revision: 1.2 $ # -# last change: $Author: hr $ $Date: 2000-09-18 15:29:34 $ +# last change: $Author: ganaya $ $Date: 2000-10-10 05:40:16 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -84,6 +84,12 @@ UNOTYPES=$($(TARGET)_XML2CMPTYPES) SLOFILES= \ $(SLO)$/invocation.obj \ $(SLO)$/$(COMP1TYPELIST)_description.obj +# NETBSD: somewhere we have to instantiate the static data members. +# NETBSD-1.2.1 doesn't know about weak symbols so the default mechanism for GCC won't work. +# SCO and MACOSX: the linker does know about weak symbols, but we can't ignore multiple defined symbols +.IF "$(OS)"=="NETBSD" || "$(OS)"=="SCO" || "$(OS)$(COM)"=="OS2GCC" || "$(OS)"=="MACOSX" +SLOFILES+=$(SLO)$/staticmbinvocation.obj +.ENDIF SHL1TARGET= $(TARGET) |