From bd0b772a4dd24deda9210356b10f04f1a1ef281d Mon Sep 17 00:00:00 2001 From: Andreas Holzammer Date: Wed, 23 Jan 2013 14:33:03 +0100 Subject: [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 Reviewed-by: David Faure Reviewed-by: Janne Anttila Reviewed-by: Johannes Oikarinen Reviewed-by: Lars Knoll --- src/3rdparty/v8/src/ia32/disasm-ia32.cc | 2 ++ src/3rdparty/v8/src/scanner.cc | 5 +++++ src/3rdparty/v8/src/win32-headers.h | 1 + 3 files changed, 8 insertions(+) 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 -- cgit v1.2.3