diff options
| author | Andreas Holzammer <andreas.holzammer@kdab.com> | 2013-01-23 14:33:03 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-01 13:53:16 +0100 |
| commit | bd0b772a4dd24deda9210356b10f04f1a1ef281d (patch) | |
| tree | 676fab21d79bafaff2b795f11a6be4e1c9241086 | |
| parent | 6b18fc14443de6e913ea001b5b2b471876f6c351 (diff) | |
| download | qtjsbackend-bd0b772a4dd24deda9210356b10f04f1a1ef281d.tar.gz | |
[V8]Undef various macros to not disturb V8
Some platforms are defining symbols to
something useful to them, but this breaks
the V8 build.
Change-Id: Ie65f2d772f8ef7b2f1b178ad67ac9d42df66a8ed
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: Johannes Oikarinen <johannes.oikarinen@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| -rw-r--r-- | src/3rdparty/v8/src/ia32/disasm-ia32.cc | 2 | ||||
| -rwxr-xr-x | src/3rdparty/v8/src/scanner.cc | 5 | ||||
| -rw-r--r-- | src/3rdparty/v8/src/win32-headers.h | 1 |
3 files changed, 8 insertions, 0 deletions
diff --git a/src/3rdparty/v8/src/ia32/disasm-ia32.cc b/src/3rdparty/v8/src/ia32/disasm-ia32.cc index 75b46bd..dd07deb 100644 --- a/src/3rdparty/v8/src/ia32/disasm-ia32.cc +++ b/src/3rdparty/v8/src/ia32/disasm-ia32.cc @@ -31,6 +31,8 @@ #include "v8.h" +#undef CONST + #if defined(V8_TARGET_ARCH_IA32) #include "disasm.h" diff --git a/src/3rdparty/v8/src/scanner.cc b/src/3rdparty/v8/src/scanner.cc index bd2db58..61ee1a4 100755 --- a/src/3rdparty/v8/src/scanner.cc +++ b/src/3rdparty/v8/src/scanner.cc @@ -32,6 +32,11 @@ #include "../include/v8stdint.h" #include "char-predicates-inl.h" +#undef CONST +#undef DELETE +#undef IN +#undef VOID + namespace v8 { namespace internal { diff --git a/src/3rdparty/v8/src/win32-headers.h b/src/3rdparty/v8/src/win32-headers.h index 5d9c89e..62f0063 100644 --- a/src/3rdparty/v8/src/win32-headers.h +++ b/src/3rdparty/v8/src/win32-headers.h @@ -98,3 +98,4 @@ #undef GetObject #undef CreateMutex #undef CreateSemaphore +#undef interface |