From 694fe666ff9f2a7a9e9c904ef66f2f5307945824 Mon Sep 17 00:00:00 2001 From: Jens-Heiner Rechtien <hr@openoffice.org> Date: Mon, 28 Apr 2003 15:32:03 +0000 Subject: INTEGRATION: CWS ooo20030412 (1.4.44); FILE MERGED 2003/04/09 12:38:01 mh 1.4.44.1: chg: use sal alloca, #i6842# --- cppuhelper/source/tdmgr.cxx | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'cppuhelper/source/tdmgr.cxx') diff --git a/cppuhelper/source/tdmgr.cxx b/cppuhelper/source/tdmgr.cxx index 908e5d235def..a2841cdbd32d 100644 --- a/cppuhelper/source/tdmgr.cxx +++ b/cppuhelper/source/tdmgr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tdmgr.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: vg $ $Date: 2003-04-15 16:35:39 $ + * last change: $Author: hr $ $Date: 2003-04-28 16:32:03 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,11 +59,8 @@ * ************************************************************************/ -#ifndef MACOSX -#include <malloc.h> -#endif -#ifdef SOLARIS -#include <alloca.h> +#ifndef INCLUDED_SAL_ALLOCA_H +#include <sal/alloca.h> #endif #include <osl/diagnose.h> -- cgit