diff options
| author | Refael Ackermann <refack@gmail.com> | 2018-10-26 15:29:04 +0300 |
|---|---|---|
| committer | Michaël Zasso <targos@protonmail.com> | 2018-11-03 15:31:14 +0300 |
| commit | 6e4f23834400b42c0579bf840800003f61f54d19 (patch) | |
| tree | f6ee6687ead28f408afb897193cee97415254a1d /deps | |
| parent | a1b75d0cbfe140a0a906e948ed4607151c8cb5f2 (diff) | |
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>
Diffstat (limited to 'deps')
| -rw-r--r-- | deps/v8/src/base/debug/stack_trace_win.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/deps/v8/src/base/debug/stack_trace_win.cc b/deps/v8/src/base/debug/stack_trace_win.cc index 6b221312332..3fe66d97ada 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> |