diff options
| author | Andreas Holzammer <andreas.holzammer@kdab.com> | 2013-01-18 10:08:52 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-12 16:58:02 +0200 |
| commit | 799032e50998220cc0645a565e3d596b5899c5e0 (patch) | |
| tree | c041a6fb338bc53eb7262bc6a9502c2b1026ba29 | |
| parent | 34167dff126de4085bf5772e49f638a602f9ab69 (diff) | |
[V8] Include windows headers first
Include the windows headers first so that the
ASSERTION macro can be overwritten of the version
of V8.
Change-Id: Iacfd98649b69b1bf706b30349600ae3a4957af7b
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Reviewed-by: David Faure <david.faure@kdab.com>
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| -rw-r--r-- | src/3rdparty/v8/src/optimizing-compiler-thread.cc | 5 | ||||
| -rw-r--r-- | src/3rdparty/v8/src/v8.h | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/3rdparty/v8/src/optimizing-compiler-thread.cc b/src/3rdparty/v8/src/optimizing-compiler-thread.cc index 1cf0434..39b45b1 100644 --- a/src/3rdparty/v8/src/optimizing-compiler-thread.cc +++ b/src/3rdparty/v8/src/optimizing-compiler-thread.cc @@ -25,6 +25,11 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// For Windows CE, Windows headers need to be included first as they define ASSERT +#ifdef _WIN32_WCE +# include "win32-headers.h" +#endif + #include "optimizing-compiler-thread.h" #include "v8.h" diff --git a/src/3rdparty/v8/src/v8.h b/src/3rdparty/v8/src/v8.h index b041fc2..e9c3d40 100644 --- a/src/3rdparty/v8/src/v8.h +++ b/src/3rdparty/v8/src/v8.h @@ -48,6 +48,11 @@ #error both DEBUG and NDEBUG are set #endif +// For Windows CE, Windows headers need to be included first as they define ASSERT +#ifdef _WIN32_WCE +# include "win32-headers.h" +#endif + // Basic includes #include "../include/v8.h" #include "v8globals.h" |