fix: potential WIN32_LEAN_AND_MEAN redefinition
#869
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
codebytere
changed the title
WIN32_LEAN_AND_MEAN redefinition
|
hmm, likely it might be better to just remove completely from this file. The generated versions of ares_build.h from autotools or cmake don't seem to have that definition. |
|
Sure - no problem, happy to just remove it :) |
|
looks good thanks! |
codebytere
added a commit
to electron/electron
that referenced
this pull request
Jan 23, 2025
codebytere
added a commit
to electron/electron
that referenced
this pull request
Jan 28, 2025
codebytere
added a commit
to electron/electron
that referenced
this pull request
Jan 28, 2025
jkleinsc
pushed a commit
to electron/electron
that referenced
this pull request
Jan 29, 2025
* chore: bump node in DEPS to v22.13.1 * chore: fixup GN build file * nodejs/node#55529 * nodejs/node#55798 * nodejs/node#55530 * module: simplify --inspect-brk handling nodejs/node#55679 * src: fix outdated js2c.cc references nodejs/node#56133 * crypto: include openssl/rand.h explicitly nodejs/node#55425 * build: use variable for crypto dep path nodejs/node#55928 * crypto: fix RSA_PKCS1_PADDING error message nodejs/node#55629 * build: use variable for simdutf path nodejs/node#56196 * test,crypto: make crypto tests work with BoringSSL nodejs/node#55491 * fix: suppress clang -Wdeprecated-declarations in libuv libuv/libuv#4486 * deps: update libuv to 1.49.1 nodejs/node#55114 * test: make test-node-output-v8-warning more flexible nodejs/node#55401 * [v22.x] Revert "v8: enable maglev on supported architectures" nodejs/node#54384 * fix: potential WIN32_LEAN_AND_MEAN redefinition c-ares/c-ares#869 * deps: update nghttp2 to 1.64.0 nodejs/node#55559 * src: provide workaround for container-overflow nodejs/node#55591 * build: use variable for simdutf path nodejs/node#56196 * chore: fixup patch indices * fixup! module: simplify --inspect-brk handling * lib: fix fs.readdir recursive async nodejs/node#56041 * lib: avoid excluding symlinks in recursive fs.readdir with filetypes nodejs/node#55714 This doesn't currently play well with ASAR - this should be fixed in a follow up * test: disable CJS permission test for config.main This has diverged as a result of our revert of src,lb: reducing C++ calls of esm legacy main resolve * fixup! lib: fix fs.readdir recursive async * deps: update libuv to 1.49.1 nodejs/node#55114 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <[email protected]>
codebytere
added a commit
to electron/electron
that referenced
this pull request
Feb 3, 2025
codebytere
added a commit
to electron/electron
that referenced
this pull request
Feb 10, 2025
codebytere
added a commit
to electron/electron
that referenced
this pull request
Feb 10, 2025
codebytere
added a commit
to electron/electron
that referenced
this pull request
Feb 12, 2025
codebytere
added a commit
to electron/electron
that referenced
this pull request
Feb 12, 2025
codebytere
added a commit
to electron/electron
that referenced
this pull request
Feb 12, 2025
codebytere
added a commit
to electron/electron
that referenced
this pull request
Feb 13, 2025
codebytere
added a commit
to electron/electron
that referenced
this pull request
Feb 13, 2025
codebytere
added a commit
to electron/electron
that referenced
this pull request
Feb 13, 2025
* chore: bump node in DEPS to v20.18.3 * src: fix outdated js2c.cc references nodejs/node#56133 * lib: remove startsWith/endsWith primordials for char checks nodejs/node#55407 * test,crypto: make crypto tests work with BoringSSL nodejs/node#55491 * fix: potential WIN32_LEAN_AND_MEAN redefinition c-ares/c-ares#869 * chore: fixup patch indices * deps: update c-ares to v1.34.1 nodejs/node#55369 * chore: fix bssl test --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <[email protected]>
codebytere
added a commit
to electron/electron
that referenced
this pull request
Feb 14, 2025
codebytere
added a commit
to electron/electron
that referenced
this pull request
Feb 14, 2025
* chore: bump node in DEPS to v22.13.0 * chore: bump node in DEPS to v22.13.1 * src: move evp stuff to ncrypto nodejs/node#54911 * crypto: add Date fields for validTo and validFrom nodejs/node#54159 * module: fix discrepancy between .ts and .js nodejs/node#54461 * esm: do not interpret "main" as a URL nodejs/node#55003 * src: modernize likely/unlikely hints nodejs/node#55155 * chore: update patch indices * crypto: add validFromDate and validToDate fields to X509Certificate nodejs/node#54159 * chore: fixup perfetto patch * fix: clang warning in simdjson * src: add receiver to fast api callback methods nodejs/node#54408 * chore: fixup revert patch * fixup! esm: do not interpret "main" as a URL * fixup! crypto: add Date fields for validTo and validFrom * fix: move ArrayBuffer test patch * src: fixup Error.stackTraceLimit during snapshot building nodejs/node#55121 * fix: bad rebase * chore: fixup amaro * chore: address feedback from review * src: revert filesystem::path changes nodejs/node#55015 * chore: fixup GN build file * nodejs/node#55529 * nodejs/node#55798 * nodejs/node#55530 * module: simplify --inspect-brk handling nodejs/node#55679 * src: fix outdated js2c.cc references nodejs/node#56133 * crypto: include openssl/rand.h explicitly nodejs/node#55425 * build: use variable for crypto dep path nodejs/node#55928 * crypto: fix RSA_PKCS1_PADDING error message nodejs/node#55629 * build: use variable for simdutf path nodejs/node#56196 * test,crypto: make crypto tests work with BoringSSL nodejs/node#55491 * fix: suppress clang -Wdeprecated-declarations in libuv libuv/libuv#4486 * deps: update libuv to 1.49.1 nodejs/node#55114 * test: make test-node-output-v8-warning more flexible nodejs/node#55401 * [v22.x] Revert "v8: enable maglev on supported architectures" nodejs/node#54384 * fix: potential WIN32_LEAN_AND_MEAN redefinition c-ares/c-ares#869 * deps: update nghttp2 to 1.64.0 nodejs/node#55559 * src: provide workaround for container-overflow nodejs/node#55591 * build: use variable for simdutf path nodejs/node#56196 * chore: fixup patch indices * fixup! module: simplify --inspect-brk handling * lib: fix fs.readdir recursive async nodejs/node#56041 * lib: avoid excluding symlinks in recursive fs.readdir with filetypes nodejs/node#55714 This doesn't currently play well with ASAR - this should be fixed in a follow up * test: disable CJS permission test for config.main This has diverged as a result of our revert of src,lb: reducing C++ calls of esm legacy main resolve * fixup! lib: fix fs.readdir recursive async * deps: update libuv to 1.49.1 nodejs/node#55114 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <[email protected]>
codebytere
added a commit
to electron/electron
that referenced
this pull request
Feb 18, 2025
codebytere
added a commit
to electron/electron
that referenced
this pull request
Feb 19, 2025
* chore: bump node in DEPS to v20.18.2 * chore: bump node in DEPS to v20.18.3 * src: fix outdated js2c.cc references nodejs/node#56133 * lib: remove startsWith/endsWith primordials for char checks nodejs/node#55407 * test,crypto: make crypto tests work with BoringSSL nodejs/node#55491 * fix: potential WIN32_LEAN_AND_MEAN redefinition c-ares/c-ares#869 * deps: update c-ares to v1.34.1 nodejs/node#55369 * chore fixup patch indices * chore: fix bssl test conditiojnal --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Refs 94b69fb
We should ensure
WIN32_LEAN_AND_MEANisn't already defined before defining it inares_build.h.The above commit, included in Node.js upgrade to c-ares v1.32.2, causes compilation failures like the following:
Other areas of c-ares (see
ares_setup.halready do this.