diff options
| -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 |