diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2014-12-02 19:33:39 +0400 |
|---|---|---|
| committer | Konstantin Ritt <ritt.ks@gmail.com> | 2014-12-28 18:46:59 +0100 |
| commit | 802a996693386791688a937a9b15ac6da278b5f0 (patch) | |
| tree | e5ae6f9ae0fca4c184a4b9c99c9e4d6bd1c7f336 | |
| parent | b7bcde88a35c0dba8bf78b829b60a634137fc778 (diff) | |
Fix build on MinGW
- alloca() needs malloc.h
- crtdbg.h couldn't be found on MinGW
Change-Id: Ibbf91a58d39ef1e2572baae3c409393acf7aa5df
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| -rw-r--r-- | src/qml/jit/qv4regalloc.cpp | 3 | ||||
| -rw-r--r-- | tools/qmlplugindump/main.cpp | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/qml/jit/qv4regalloc.cpp b/src/qml/jit/qv4regalloc.cpp index 16792d8a1e..330714db8c 100644 --- a/src/qml/jit/qv4regalloc.cpp +++ b/src/qml/jit/qv4regalloc.cpp @@ -37,6 +37,9 @@ #include <private/qv4value_inl_p.h> #include <algorithm> +#if defined(Q_CC_MINGW) +# include <malloc.h> +#endif namespace { enum { DebugRegAlloc = 0 }; diff --git a/tools/qmlplugindump/main.cpp b/tools/qmlplugindump/main.cpp index b387e4ff6e..36af41c246 100644 --- a/tools/qmlplugindump/main.cpp +++ b/tools/qmlplugindump/main.cpp @@ -62,7 +62,9 @@ #include <signal.h> #endif #ifdef Q_OS_WIN -#include <crtdbg.h> +# if !defined(Q_CC_MINGW) +# include <crtdbg.h> +# endif #include <qt_windows.h> #endif |