diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-11-14 23:02:30 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-11-17 11:06:51 +0100 |
| commit | b3e5b5941f06dab1818e77b12ff0243eecf24601 (patch) | |
| tree | f5a8b301e88fcdccb0704088143cb8830b2db678 /vcl/source | |
| parent | 096c7e889f3b9bd42a81fb0216e2a68fb27159fc (diff) | |
bridges, vcl: turns out there is sal/alloca.h; replace #ifdefery
Change-Id: I2eda8dab51e66af7856b55f2d5f297620e07ccdb
Diffstat (limited to 'vcl/source')
| -rw-r--r-- | vcl/source/font/PhysicalFontCollection.cxx | 4 | ||||
| -rw-r--r-- | vcl/source/outdev/text.cxx | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/vcl/source/font/PhysicalFontCollection.cxx b/vcl/source/font/PhysicalFontCollection.cxx index dbff2c35b628..4eee2251d464 100644 --- a/vcl/source/font/PhysicalFontCollection.cxx +++ b/vcl/source/font/PhysicalFontCollection.cxx @@ -18,6 +18,7 @@ */ #include <sal/types.h> +#include <sal/alloca.h> #include <vector> @@ -36,9 +37,6 @@ #include "PhysicalFontCollection.hxx" -#ifdef SOLARIS -#include <alloca.h> -#endif static unsigned lcl_IsCJKFont( const OUString& rFontName ) { diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx index 151d888cac14..99ab2502beed 100644 --- a/vcl/source/outdev/text.cxx +++ b/vcl/source/outdev/text.cxx @@ -22,6 +22,7 @@ #include <cmath> #include <sal/types.h> +#include <sal/alloca.h> #include <basegfx/matrix/b2dhommatrix.hxx> @@ -50,9 +51,6 @@ #include "graphite_features.hxx" #endif -#ifdef SOLARIS -#include <alloca.h> -#endif #define TEXT_DRAW_ELLIPSIS (TEXT_DRAW_ENDELLIPSIS | TEXT_DRAW_PATHELLIPSIS | TEXT_DRAW_NEWSELLIPSIS) |