[Libreoffice-commits] core.git: vcl/source
Richard PALO
richard at NetBSD.org
Wed Nov 12 04:31:31 PST 2014
vcl/source/font/PhysicalFontCollection.cxx | 4 ++++
vcl/source/outdev/text.cxx | 4 ++++
2 files changed, 8 insertions(+)
New commits:
commit c22480ada409325a1c9a67dd06ce95b1028cb07e
Author: Richard PALO <richard at NetBSD.org>
Date: Mon Nov 10 17:46:43 2014 +0100
alloca needs special include on SOLARIS
Change-Id: I72415dbaf1350913938950eb1c0487a78cd67935
Signed-off-by: Michael Stahl <mstahl at redhat.com>
diff --git a/vcl/source/font/PhysicalFontCollection.cxx b/vcl/source/font/PhysicalFontCollection.cxx
index 56a8d74..dbff2c3 100644
--- a/vcl/source/font/PhysicalFontCollection.cxx
+++ b/vcl/source/font/PhysicalFontCollection.cxx
@@ -36,6 +36,10 @@
#include "PhysicalFontCollection.hxx"
+#ifdef SOLARIS
+#include <alloca.h>
+#endif
+
static unsigned lcl_IsCJKFont( const OUString& rFontName )
{
// Test, if Fontname includes CJK characters --> In this case we
diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index 2dd7859..151d888 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -50,6 +50,10 @@
#include "graphite_features.hxx"
#endif
+#ifdef SOLARIS
+#include <alloca.h>
+#endif
+
#define TEXT_DRAW_ELLIPSIS (TEXT_DRAW_ENDELLIPSIS | TEXT_DRAW_PATHELLIPSIS | TEXT_DRAW_NEWSELLIPSIS)
ImplMultiTextLineInfo::ImplMultiTextLineInfo()
More information about the Libreoffice-commits
mailing list