-
Notifications
You must be signed in to change notification settings - Fork 30.7k
New issue
Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? # to your account
deps,v8: cherry-pick dc704497 #23985
Conversation
a522112
to
46ddcf1
Compare
That affects only the targets that stack_trace_win.cc
d:\code\node\deps\v8\src\base\macros.h(406): warning C4003: not enough arguments for function-like macro invocation 'min' [D:\code\node\deps\v8\gypfiles\v8_libbase.vcxproj]
d:\code\node\deps\v8\src\base\macros.h(408): warning C4003: not enough arguments for function-like macro invocation 'max' [D:\code\node\deps\v8\gypfiles\v8_libbase.vcxproj]
d:\code\node\deps\v8\src\base\macros.h(411): warning C4003: not enough arguments for function-like macro invocation 'min' [D:\code\node\deps\v8\gypfiles\v8_libbase.vcxproj]
d:\code\node\deps\v8\src\base\macros.h(414): warning C4003: not enough arguments for function-like macro invocation 'max' [D:\code\node\deps\v8\gypfiles\v8_libbase.vcxproj]
logging.cc and when trying to build with
|
Doesn't this work? diff --git a/deps/v8/gypfiles/v8.gyp b/deps/v8/gypfiles/v8.gyp
index f47cf075bb..b97dfb9324 100644
--- a/deps/v8/gypfiles/v8.gyp
+++ b/deps/v8/gypfiles/v8.gyp
@@ -2139,6 +2139,7 @@
'libraries': [ '-lwinmm', '-lws2_32' ],
},
}, {
+ 'defines': [ 'NOMINMAX' ],
'sources': [
'../src/base/debug/stack_trace_win.cc',
'../src/base/platform/platform-win32.cc',
Never mind, I somehow missed that this was a cherry-pick. |
Original commit message: undef min,max macros on windows This blocks building with official clang-cl and Windows SDK Refs: nodejs#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@{nodejs#57053} PR-URL: nodejs#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>
46ddcf1
to
d24756b
Compare
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>
Refs: #19630
Refs: v8/v8@dc70449
Original commit message:
Checklist
make -j4 test
(UNIX), orvcbuild test
(Windows) passes