Skip to content

fix(profiling): override win macros #11860

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 1, 2024
Merged

fix(profiling): override win macros #11860

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion packages/profiling-node/binding.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,15 @@
# Silence gcc8 deprecation warning https://github.com/nodejs/nan/issues/807#issuecomment-455750192
"cflags": ["-Wno-cast-function-type"]
},
]
],
'conditions': [
[ 'OS=="win"', {
'defines': [
# Stop <windows.h> from defining macros that conflict with
# std::min() and std::max(). We don't use <windows.h> (much)
# but we still inherit it from uv.h.
'NOMINMAX',
]
}],
],
}
3 changes: 3 additions & 0 deletions packages/profiling-node/bindings/cpu_profiler.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
#ifndef NOMINMAX
#define NOMINMAX
#endif

#include <assert.h>
#include <math.h>
Expand Down