alloca() is declared in stdlib.h on BSD systems

... except on Darwin.

Bonus change: Updated auto-tests trying to include 'alloca.h'.

This is a follow up on 24c43a5748.

Change-Id: I299de00bf0dca7842470b158282daea221a10f2d
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
This commit is contained in:
Gabriel de Dietrich 2014-02-02 12:34:00 +01:00 committed by The Qt Project
parent 3408bd9d08
commit ae19cdacbe
3 changed files with 3 additions and 15 deletions

View File

@ -49,10 +49,8 @@
# ifndef __GNUC__
# define alloca _alloca
# endif
#else
#if !defined(__FreeBSD__) && !defined(__DragonFly__)
#elif !defined(Q_OS_BSD4) || defined(Q_OS_DARWIN)
# include <alloca.h>
#endif
#endif
#endif

View File

@ -48,6 +48,7 @@
#include <qstandarditemmodel.h>
#include <QtCore/qnumeric.h>
#include <stdlib.h>
#include <private/qv4alloca_p.h>
#ifdef Q_CC_MSVC
#define NO_INLINE __declspec(noinline)
@ -55,12 +56,6 @@
#define NO_INLINE __attribute__((noinline))
#endif
#if defined(Q_OS_WIN)
#include <malloc.h>
#else
#include <alloca.h>
#endif
Q_DECLARE_METATYPE(QList<int>)
Q_DECLARE_METATYPE(QObjectList)

View File

@ -55,6 +55,7 @@
#include "../../shared/util.h"
#include <private/qv4functionobject_p.h>
#include <private/qv4scopedvalue_p.h>
#include <private/qv4alloca_p.h>
#ifdef Q_CC_MSVC
#define NO_INLINE __declspec(noinline)
@ -62,12 +63,6 @@
#define NO_INLINE __attribute__((noinline))
#endif
#if defined(Q_OS_WIN)
#include <malloc.h>
#else
#include <alloca.h>
#endif
/*
This test covers evaluation of ECMAScript expressions and bindings from within
QML. This does not include static QML language issues.