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>

diff --git a/src/qml/jit/qv4regalloc.cpp b/src/qml/jit/qv4regalloc.cpp
index 16792d8..330714d 100644 (file)
--- 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 b387e4f..36af41c 100644 (file)
--- 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