diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-05-04 14:03:10 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-05-04 14:03:11 +0200 |
| commit | 464a43d43c2bb2440d4ad745bc134e0dac10872c (patch) | |
| tree | b1c27b1d1c11f9c43bd2e62e1fd955bc6f89029f /config.tests/common/alloca/alloca.cpp | |
| parent | 0208cac94fbd79fc563c903e2b973d79f9644b82 (diff) | |
| parent | 877ef0594d94f48bf063446b1f8a4b5e1941a8cd (diff) | |
Merge 5.9 into 5.9.0v5.9.0-beta4
Change-Id: Id3fc911f024cba292a5c426b36aa94ff9f3c0ef7
Diffstat (limited to 'config.tests/common/alloca/alloca.cpp')
| -rw-r--r-- | config.tests/common/alloca/alloca.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/config.tests/common/alloca/alloca.cpp b/config.tests/common/alloca/alloca.cpp index d839b381ef..500bdb9ba2 100644 --- a/config.tests/common/alloca/alloca.cpp +++ b/config.tests/common/alloca/alloca.cpp @@ -37,10 +37,17 @@ ** ****************************************************************************/ -#include <alloca.h> - +#if defined(USE_ALLOCA_H) +# include <alloca.h> +# ifdef __QNXNTO__ // extra include needed in QNX7 to define NULL for the alloca() macro -#include <stdlib.h> +# include <stddef.h> +# endif +#elif defined(USE_MALLOC_H) +# include <malloc.h> +#else +# include <stdlib.h> +#endif int main(int, char **) { |