Kaydet (Commit) b3e5b594 authored tarafından Michael Stahl's avatar Michael Stahl

bridges, vcl: turns out there is sal/alloca.h; replace #ifdefery

Change-Id: I2eda8dab51e66af7856b55f2d5f297620e07ccdb
üst 096c7e88
...@@ -18,11 +18,7 @@ ...@@ -18,11 +18,7 @@
*/ */
#if defined (FREEBSD) || defined(NETBSD) || defined(OPENBSD) || defined(DRAGONFLY) #include <sal/alloca.h>
#include <stdlib.h>
#else
#include <alloca.h>
#endif
#include <com/sun/star/uno/genfunc.hxx> #include <com/sun/star/uno/genfunc.hxx>
#include "com/sun/star/uno/RuntimeException.hpp" #include "com/sun/star/uno/RuntimeException.hpp"
......
...@@ -17,11 +17,8 @@ ...@@ -17,11 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#if defined (FREEBSD) || defined(NETBSD) || defined(OPENBSD) || defined(DRAGONFLY) #include <sal/alloca.h>
#include <stdlib.h>
#else
#include <alloca.h>
#endif
#include <exception> #include <exception>
#include <typeinfo> #include <typeinfo>
......
...@@ -17,11 +17,8 @@ ...@@ -17,11 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#if defined (FREEBSD) || defined(NETBSD) || defined(OPENBSD) || defined(DRAGONFLY) #include <sal/alloca.h>
#include <stdlib.h>
#else
#include <alloca.h>
#endif
#include <exception> #include <exception>
#include <typeinfo> #include <typeinfo>
......
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
*/ */
#include <sal/types.h> #include <sal/types.h>
#include <sal/alloca.h>
#include <vector> #include <vector>
...@@ -36,9 +37,6 @@ ...@@ -36,9 +37,6 @@
#include "PhysicalFontCollection.hxx" #include "PhysicalFontCollection.hxx"
#ifdef SOLARIS
#include <alloca.h>
#endif
static unsigned lcl_IsCJKFont( const OUString& rFontName ) static unsigned lcl_IsCJKFont( const OUString& rFontName )
{ {
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include <cmath> #include <cmath>
#include <sal/types.h> #include <sal/types.h>
#include <sal/alloca.h>
#include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/matrix/b2dhommatrix.hxx>
...@@ -50,9 +51,6 @@ ...@@ -50,9 +51,6 @@
#include "graphite_features.hxx" #include "graphite_features.hxx"
#endif #endif
#ifdef SOLARIS
#include <alloca.h>
#endif
#define TEXT_DRAW_ELLIPSIS (TEXT_DRAW_ENDELLIPSIS | TEXT_DRAW_PATHELLIPSIS | TEXT_DRAW_NEWSELLIPSIS) #define TEXT_DRAW_ELLIPSIS (TEXT_DRAW_ENDELLIPSIS | TEXT_DRAW_PATHELLIPSIS | TEXT_DRAW_NEWSELLIPSIS)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment