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 | |
| parent | 096c7e889f3b9bd42a81fb0216e2a68fb27159fc (diff) | |
bridges, vcl: turns out there is sal/alloca.h; replace #ifdefery
Change-Id: I2eda8dab51e66af7856b55f2d5f297620e07ccdb
| -rw-r--r-- | bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx | 6 | ||||
| -rw-r--r-- | bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx | 7 | ||||
| -rw-r--r-- | bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx | 7 | ||||
| -rw-r--r-- | vcl/source/font/PhysicalFontCollection.cxx | 4 | ||||
| -rw-r--r-- | vcl/source/outdev/text.cxx | 4 |
5 files changed, 7 insertions, 21 deletions
diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx index 20262db4569d..3a31d080be5e 100644 --- a/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx @@ -18,11 +18,7 @@ */ -#if defined (FREEBSD) || defined(NETBSD) || defined(OPENBSD) || defined(DRAGONFLY) -#include <stdlib.h> -#else -#include <alloca.h> -#endif +#include <sal/alloca.h> #include <com/sun/star/uno/genfunc.hxx> #include "com/sun/star/uno/RuntimeException.hpp" diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx index 4a90a5019acd..52826e07c307 100644 --- a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx @@ -17,11 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#if defined (FREEBSD) || defined(NETBSD) || defined(OPENBSD) || defined(DRAGONFLY) -#include <stdlib.h> -#else -#include <alloca.h> -#endif +#include <sal/alloca.h> + #include <exception> #include <typeinfo> diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx index 2a54267402c4..1ff023427a08 100644 --- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx @@ -17,11 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#if defined (FREEBSD) || defined(NETBSD) || defined(OPENBSD) || defined(DRAGONFLY) -#include <stdlib.h> -#else -#include <alloca.h> -#endif +#include <sal/alloca.h> + #include <exception> #include <typeinfo> 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) |