aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/jsruntime/qv4alloca_p.h
diff options
context:
space:
mode:
authorGabriel de Dietrich <gabriel.dedietrich@digia.com>2014-02-02 12:34:00 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-02-02 14:29:07 +0100
commitae19cdacbeade9e55bd4bf15314221c8fa182b5f (patch)
tree4b81c40b6bd1c5eb2b7a89417c2d8058486ae16a /src/qml/jsruntime/qv4alloca_p.h
parent3408bd9d08630687515401cfaadaf818912d72d7 (diff)
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 24c43a5748b8502. Change-Id: I299de00bf0dca7842470b158282daea221a10f2d Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4alloca_p.h')
-rw-r--r--src/qml/jsruntime/qv4alloca_p.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/qml/jsruntime/qv4alloca_p.h b/src/qml/jsruntime/qv4alloca_p.h
index e51c6dff00..a76c327b04 100644
--- a/src/qml/jsruntime/qv4alloca_p.h
+++ b/src/qml/jsruntime/qv4alloca_p.h
@@ -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