diff options
| author | Refael Ackermann <refack@gmail.com> | 2018-10-26 08:29:04 -0400 |
|---|---|---|
| committer | Refael Ackermann <refack@gmail.com> | 2018-11-02 20:30:28 -0400 |
| commit | d24756bf790c4d00fffe2366defa910b5ef760c3 (patch) | |
| tree | 1506ec61ff365ccd46b21b5949d2f1729ca64441 | |
| parent | c51d47d5df22234c34968ade0ae470ceb9343d48 (diff) | |
| download | node-new-d24756bf790c4d00fffe2366defa910b5ef760c3.tar.gz | |
deps,v8: cherry-pick dc704497
Original commit message:
undef min,max macros on windows
This blocks building with official clang-cl and Windows SDK
Refs: https://github.com/nodejs/node/issues/19630
Change-Id: I41fdf934f486c660df7a9e0dd284f6eb3c294dd4
Reviewed-on: https://chromium-review.googlesource.com/c/1297479
Commit-Queue: Jakob Gruber <jgruber@chromium.org>
Reviewed-by: Jakob Gruber <jgruber@chromium.org>
Cr-Commit-Position: refs/heads/master@{#57053}
PR-URL: https://github.com/nodejs/node/pull/23985
Refs: https://github.com/v8/v8/commit/dc704497ee84245931533c3575dd250d4b498300
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
| -rw-r--r-- | common.gypi | 2 | ||||
| -rw-r--r-- | deps/v8/src/base/debug/stack_trace_win.cc | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/common.gypi b/common.gypi index 779073a635..e3758393c0 100644 --- a/common.gypi +++ b/common.gypi @@ -30,7 +30,7 @@ # Reset this number to 0 on major V8 upgrades. # Increment by one for each non-official patch applied to deps/v8. - 'v8_embedder_string': '-node.8', + 'v8_embedder_string': '-node.9', # Enable disassembler for `--print-code` v8 options 'v8_enable_disassembler': 1, diff --git a/deps/v8/src/base/debug/stack_trace_win.cc b/deps/v8/src/base/debug/stack_trace_win.cc index 6b22131233..3fe66d97ad 100644 --- a/deps/v8/src/base/debug/stack_trace_win.cc +++ b/deps/v8/src/base/debug/stack_trace_win.cc @@ -7,6 +7,13 @@ #include "src/base/debug/stack_trace.h" +// This file can't use "src/base/win32-headers.h" because it defines symbols +// that lead to compilation errors. But `NOMINMAX` should be defined to disable +// defining of the `min` and `max` MACROS. +#ifndef NOMINMAX +#define NOMINMAX +#endif + #include <windows.h> #include <dbghelp.h> #include <Shlwapi.h> |