diff options
| author | Gene Anaya <ganaya@openoffice.org> | 2000-10-10 04:35:45 +0000 |
|---|---|---|
| committer | Gene Anaya <ganaya@openoffice.org> | 2000-10-10 04:35:45 +0000 |
| commit | e3d6f58cf3937d0a15b91027e3d360ea534a8293 (patch) | |
| tree | fc538047e79e55394e44783bc4c96eac8f7db23f /stoc/source/corereflection | |
| parent | 75c5d408572002000c9f1c7a832ecc351da43eaf (diff) | |
Add staticmbcorereflection.cxx for macosx
Diffstat (limited to 'stoc/source/corereflection')
| -rw-r--r-- | stoc/source/corereflection/criface.cxx | 6 | ||||
| -rw-r--r-- | stoc/source/corereflection/makefile.mk | 10 |
2 files changed, 12 insertions, 4 deletions
diff --git a/stoc/source/corereflection/criface.cxx b/stoc/source/corereflection/criface.cxx index 8d0ae2730660..8ee9855f5d27 100644 --- a/stoc/source/corereflection/criface.cxx +++ b/stoc/source/corereflection/criface.cxx @@ -2,9 +2,9 @@ * * $RCSfile: criface.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 15:29:33 $ + * last change: $Author: ganaya $ $Date: 2000-10-10 05:35:45 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -61,8 +61,10 @@ #include <sal/config.h> #ifdef SAL_UNX +#ifndef MACOSX #include <alloca.h> #endif +#endif #include <malloc.h> #ifndef _RTL_ALLOC_H_ #include <rtl/alloc.h> diff --git a/stoc/source/corereflection/makefile.mk b/stoc/source/corereflection/makefile.mk index 4a9421865067..57a2ff713544 100644 --- a/stoc/source/corereflection/makefile.mk +++ b/stoc/source/corereflection/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:33 $ +# last change: $Author: ganaya $ $Date: 2000-10-10 05:35:45 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -88,6 +88,12 @@ SLOFILES= \ $(SLO)$/criface.obj \ $(SLO)$/crenum.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)$/staticmbcorereflection.obj +.ENDIF SHL1TARGET= $(TARGET) |