Fix build against Windows.h

The system header file is kind enough to define a macro called CONST,
which conflicts with our IR member function. Resolve the conflict by
deleting the macro.

Change-Id: I19ec1eadd54159a9bea128ef2a586d089f56b548
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

diff --git a/src/v4/qv4codegen.cpp b/src/v4/qv4codegen.cpp
index 0b62256..c44e54d 100644 (file)
--- a/src/v4/qv4codegen.cpp
+++ b/src/v4/qv4codegen.cpp
@@ -55,6 +55,10 @@
 #include <iostream>
 #include <cassert>
 
+#ifdef CONST
+#undef CONST
+#endif
+
 using namespace QQmlJS;
 using namespace AST;
 

diff --git a/src/v4/qv4ir_p.h b/src/v4/qv4ir_p.h
index 8ad783c..eefc039 100644 (file)
--- a/src/v4/qv4ir_p.h
+++ b/src/v4/qv4ir_p.h
@@ -59,6 +59,10 @@
 #include <QtCore/QString>
 #include <QtCore/QBitArray>
 
+#ifdef CONST
+#undef CONST
+#endif
+
 QT_BEGIN_NAMESPACE
 
 class QTextStream;