Permalink
Browse files

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 <jgruber@chromium.org>
  Reviewed-by: Jakob Gruber <jgruber@chromium.org>
  Cr-Commit-Position: refs/heads/master@{#57053}

PR-URL: #23985
Refs: v8/v8@dc70449
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
  • Loading branch information...
refack committed Oct 26, 2018
1 parent c51d47d commit d24756bf790c4d00fffe2366defa910b5ef760c3
Showing with 8 additions and 1 deletion.
  1. +1 −1 common.gypi
  2. +7 −0 deps/v8/src/base/debug/stack_trace_win.cc
@@ -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,
@@ -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>

0 comments on commit d24756b

Please sign in to comment.