diff options
| author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2003-08-18 13:56:32 +0000 |
|---|---|---|
| committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2003-08-18 13:56:32 +0000 |
| commit | bc7e17d4e1a22c4b9a75b4e65fbaaebe1e9134c0 (patch) | |
| tree | aff8621bf8094b510604736a48f979877b5326c2 /cppu/source/typelib | |
| parent | 5a757546818c05891d24441a4b2d26bf87c03810 (diff) | |
INTEGRATION: CWS geordi2q01 (1.18.16); FILE MERGED
2003/08/18 12:47:28 hr 1.18.16.1: #i18350#: join changes from CWS ooo11rc3
Diffstat (limited to 'cppu/source/typelib')
| -rw-r--r-- | cppu/source/typelib/typelib.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx index 1cb806e665c2..a07d73e6003a 100644 --- a/cppu/source/typelib/typelib.cxx +++ b/cppu/source/typelib/typelib.cxx @@ -2,9 +2,9 @@ * * $RCSfile: typelib.cxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: vg $ $Date: 2003-06-12 10:33:51 $ + * last change: $Author: hjs $ $Date: 2003-08-18 14:56:32 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -71,7 +71,7 @@ #else #include <malloc.h> #endif -#ifdef SOLARIS +#if defined(SOLARIS) || defined(IRIX) #include <alloca.h> #endif #include <new> |