summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2015-01-23 11:04:05 +0100
committerCaolán McNamara <caolanm@redhat.com>2015-01-23 11:49:47 +0000
commitd1f6db02338a723dbce77293398475ae44bc8f58 (patch)
tree1971fff4194ced3c1b807333c1afbbab305502b0 /vcl
parentb0b6abf9596c5d5baa73439aa0c03467b8126469 (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>
Diffstat (limited to 'vcl')
-rw-r--r--vcl/unx/gtk/a11y/atkwrapper.cxx1
-rw-r--r--vcl/win/source/gdi/winlayout.cxx5
2 files changed, 2 insertions, 4 deletions
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>