diff options
| -rw-r--r-- | connectivity/source/manager/makefile.mk | 11 | ||||
| -rw-r--r-- | connectivity/source/parse/sqlnode.cxx | 7 |
2 files changed, 14 insertions, 4 deletions
diff --git a/connectivity/source/manager/makefile.mk b/connectivity/source/manager/makefile.mk index aaff11348e0a..12780592d2eb 100644 --- a/connectivity/source/manager/makefile.mk +++ b/connectivity/source/manager/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 16:14:28 $ +# last change: $Author: patrick.luby $ $Date: 2000-09-25 04:28:50 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -109,6 +109,13 @@ SLOFILES=\ $(SLO)$/mdrivermanager.obj \ $(SLO)$/registration.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)$/staticmbmanager.obj +.ENDIF + # --- Library ----------------------------------- SHL1TARGET= $(SDBC_TARGET)$(SDBC_MAJOR) diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx index f35c06bf8f25..8282fa4afaac 100644 --- a/connectivity/source/parse/sqlnode.cxx +++ b/connectivity/source/parse/sqlnode.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sqlnode.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:14:28 $ + * last change: $Author: patrick.luby $ $Date: 2000-09-25 04:28:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -85,6 +85,9 @@ #ifndef _ISOLANG_HXX #include <tools/isolang.hxx> #endif +#ifndef __SGI_STL_ROPE +#include <stl/rope> +#endif using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::util; |