toolkit/source/awt/vclxfont.cxx | 1 + toolkit/source/awt/vclxgraphics.cxx | 1 + vcl/unx/gtk/a11y/atkwrapper.cxx | 1 + vcl/win/source/gdi/winlayout.cxx | 5 +---- 4 files changed, 4 insertions(+), 4 deletions(-)
New commits: commit d1f6db02338a723dbce77293398475ae44bc8f58 Author: Michael Stahl <[email protected]> Date: Fri Jan 23 11:04:05 2015 +0100 calling alloca() requires #include <sal/alloca.h> Change-Id: I59e5ede0c0cfb10f4196d79ae762132ae4ecb9bb (cherry picked from commit 91567c26f436ccce0fb60ad6a9671f046a4a68e7) Reviewed-on: https://gerrit.libreoffice.org/14125 Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> diff --git a/toolkit/source/awt/vclxfont.cxx b/toolkit/source/awt/vclxfont.cxx index d3b4f27..d937ad4 100644 --- a/toolkit/source/awt/vclxfont.cxx +++ b/toolkit/source/awt/vclxfont.cxx @@ -26,6 +26,7 @@ #include <cppuhelper/queryinterface.hxx> #include <rtl/uuid.h> #include <rtl/ustring.h> +#include <sal/alloca.h> #include <vcl/outdev.hxx> diff --git a/toolkit/source/awt/vclxgraphics.cxx b/toolkit/source/awt/vclxgraphics.cxx index 3dc4246..fe2b328 100644 --- a/toolkit/source/awt/vclxgraphics.cxx +++ b/toolkit/source/awt/vclxgraphics.cxx @@ -26,6 +26,7 @@ #include <cppuhelper/typeprovider.hxx> #include <cppuhelper/queryinterface.hxx> #include <rtl/uuid.h> +#include <sal/alloca.h> #include <vcl/svapp.hxx> #include <vcl/outdev.hxx> diff --git a/vcl/unx/gtk/a11y/atkwrapper.cxx b/vcl/unx/gtk/a11y/atkwrapper.cxx index 552c8e3..688ce62 100644 --- a/vcl/unx/gtk/a11y/atkwrapper.cxx +++ b/vcl/unx/gtk/a11y/atkwrapper.cxx @@ -55,6 +55,7 @@ #include <rtl/ref.hxx> #include <osl/diagnose.h> +#include <sal/alloca.h> #include <cppuhelper/factory.hxx> #include <cppuhelper/queryinterface.hxx> diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx index 228e67a..4a147b0 100644 --- a/vcl/win/source/gdi/winlayout.cxx +++ b/vcl/win/source/gdi/winlayout.cxx @@ -32,10 +32,7 @@ #include "sallayout.hxx" #include <cstdio> -#include <malloc.h> -#ifndef __MINGW32__ -#define alloca _alloca -#endif +#include <sal/alloca.h> #include <algorithm>
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
