diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-04-28 15:31:42 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-04-28 15:31:42 +0000 |
| commit | 8694ce8ec2beee748c5e566290d79d02b98c4772 (patch) | |
| tree | 1faea66be5d3277e72629ba84f96a55daf145f9b /cppuhelper | |
| parent | fe4225e248c165d02c4cfac8c2b07f0ba7c6848a (diff) | |
INTEGRATION: CWS ooo20030412 (1.5.30); FILE MERGED
2003/04/09 12:35:30 mh 1.5.30.1: chg: use sal alloca, #i6842#
Diffstat (limited to 'cppuhelper')
| -rw-r--r-- | cppuhelper/source/implbase_ex.cxx | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/cppuhelper/source/implbase_ex.cxx b/cppuhelper/source/implbase_ex.cxx index 4bb05a0109c6..d247d1088c51 100644 --- a/cppuhelper/source/implbase_ex.cxx +++ b/cppuhelper/source/implbase_ex.cxx @@ -2,9 +2,9 @@ * * $RCSfile: implbase_ex.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: vg $ $Date: 2003-04-15 16:34:54 $ + * last change: $Author: hr $ $Date: 2003-04-28 16:31:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,14 +59,10 @@ * ************************************************************************/ -#ifdef SOLARIS -#include <alloca.h> -#elif defined MACOSX -#include <sys/types.h> -#include <sys/malloc.h> -#else -#include <malloc.h> +#ifndef INCLUDED_SAL_ALLOCA_H +#include <sal/alloca.h> #endif + #include <string.h> #ifndef _OSL_DIAGNOSE_H_ |