diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-01-23 11:04:05 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-01-23 11:49:47 +0000 |
| commit | d1f6db02338a723dbce77293398475ae44bc8f58 (patch) | |
| tree | 1971fff4194ced3c1b807333c1afbbab305502b0 | |
| parent | b0b6abf9596c5d5baa73439aa0c03467b8126469 (diff) | |
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 <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | toolkit/source/awt/vclxfont.cxx | 1 | ||||
| -rw-r--r-- | toolkit/source/awt/vclxgraphics.cxx | 1 | ||||
| -rw-r--r-- | vcl/unx/gtk/a11y/atkwrapper.cxx | 1 | ||||
| -rw-r--r-- | vcl/win/source/gdi/winlayout.cxx | 5 |
4 files changed, 4 insertions, 4 deletions
diff --git a/toolkit/source/awt/vclxfont.cxx b/toolkit/source/awt/vclxfont.cxx index d3b4f2767f18..d937ad47591e 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 3dc4246f685e..fe2b328c48ca 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 552c8e390cb1..688ce622ac7b 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 228e67ac937a..4a147b0d3c05 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> |