Skip to content

Commit 6e4f238

Browse files
refacktargos
authored andcommitted
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: #19630 Change-Id: I41fdf934f486c660df7a9e0dd284f6eb3c294dd4 Reviewed-on: https://chromium-review.googlesource.com/c/1297479 Commit-Queue: Jakob Gruber <[email protected]> Reviewed-by: Jakob Gruber <[email protected]> Cr-Commit-Position: refs/heads/master@{#57053} PR-URL: #23985 Refs: v8/v8@dc70449 Reviewed-By: Richard Lau <[email protected]> Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Colin Ihrig <[email protected]>
1 parent a1b75d0 commit 6e4f238

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

common.gypi

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
# Reset this number to 0 on major V8 upgrades.
3232
# Increment by one for each non-official patch applied to deps/v8.
33-
'v8_embedder_string': '-node.8',
33+
'v8_embedder_string': '-node.9',
3434

3535
# Enable disassembler for `--print-code` v8 options
3636
'v8_enable_disassembler': 1,

deps/v8/src/base/debug/stack_trace_win.cc

+7
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,13 @@
77

88
#include "src/base/debug/stack_trace.h"
99

10+
// This file can't use "src/base/win32-headers.h" because it defines symbols
11+
// that lead to compilation errors. But `NOMINMAX` should be defined to disable
12+
// defining of the `min` and `max` MACROS.
13+
#ifndef NOMINMAX
14+
#define NOMINMAX
15+
#endif
16+
1017
#include <windows.h>
1118
#include <dbghelp.h>
1219
#include <Shlwapi.h>

0 commit comments

Comments
 (0)