vcl/source/font/PhysicalFontCollection.cxx | 4 ++++ vcl/source/outdev/text.cxx | 4 ++++ 2 files changed, 8 insertions(+)
New commits: commit f0025f96439c8738b045329468fe3ce34a498f47 Author: Richard PALO <[email protected]> Date: Mon Nov 10 17:46:43 2014 +0100 alloca needs special include on SOLARIS Signed-off-by: Michael Stahl <[email protected]> (cherry picked from commit c22480ada409325a1c9a67dd06ce95b1028cb07e) Change-Id: I72415dbaf1350913938950eb1c0487a78cd67935 diff --git a/vcl/source/font/PhysicalFontCollection.cxx b/vcl/source/font/PhysicalFontCollection.cxx index e195065..0bf7904 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 OUString lcl_stripCharSetFromName(const OUString& _aName) { // I worry that someone will have a font which *does* have diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx index e426368..bb6369d 100644 --- a/vcl/source/outdev/text.cxx +++ b/vcl/source/outdev/text.cxx @@ -46,6 +46,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() _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
