diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-04-28 15:26:45 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-04-28 15:26:45 +0000 |
| commit | efcb2511eb7caf5873115b739679b81da198e272 (patch) | |
| tree | a6dde0b56917f52c22e46d9a77ab33b494d84b9f /cppu | |
| parent | 68467be45dafaefdfed34ee19d70ab9419d27f05 (diff) | |
INTEGRATION: CWS ooo20030412 (1.25.26); FILE MERGED
2003/04/14 16:57:44 mh 1.25.26.2: RESYNC: (1.25-1.26); FILE MERGED
2003/04/09 12:30:35 mh 1.25.26.1: chg: use sal alloca, #i6842#
Diffstat (limited to 'cppu')
| -rw-r--r-- | cppu/source/uno/lbenv.cxx | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx index 6b25f1e893f0..c1c9b159ccf5 100644 --- a/cppu/source/uno/lbenv.cxx +++ b/cppu/source/uno/lbenv.cxx @@ -2,9 +2,9 @@ * * $RCSfile: lbenv.cxx,v $ * - * $Revision: 1.27 $ + * $Revision: 1.28 $ * - * last change: $Author: vg $ $Date: 2003-04-15 16:37:42 $ + * last change: $Author: hr $ $Date: 2003-04-28 16:26:45 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -60,16 +60,12 @@ ************************************************************************/ #include <stdio.h> -#ifdef SOLARIS -#include <alloca.h> -#elif defined MACOSX -#include <sys/malloc.h> -#else -#include <malloc.h> -#endif #include <hash_map> #include <vector> +#ifndef INCLUDE_SAL_ALLOCA_H +#include <sal/alloca.h> +#endif #include "osl/diagnose.h" #include "osl/interlck.h" #include "osl/mutex.hxx" |