1
0
Fork
You've already forked monero
0

src: use compiler-defined win32 macro #17

Open
jpk68 wants to merge 1 commit from remove-win32 into master
pull from: remove-win32
merge into: jpk68:master
jpk68:master
jpk68:i2p-addresses
jpk68:i2p-sam
jpk68:asio-headers
jpk68:systemd
jpk68:openrc-service
jpk68:threadpool-thread-local
jpk68:wallet-dir
jpk68:ifdef-glibc
jpk68:remove-dead-onion-node
jpk68:remove-whitespace
jpk68:onion-old
jpk68:add-key
jpk68:russian-name
jpk68:missing-fish
jpk68:sccache
jpk68:rust-cmake
jpk68:util-fix
jpk68:broken-copyright
jpk68:dns-utils
jpk68:manpages
jpk68:contrib-license
jpk68:contrib-docs
jpk68:fcmp-pp-rust-build
jpk68:sccache-build
jpk68:remove-msvc
jpk68:fcmp++-stage
jpk68:onion-karma
jpk68:wallet2-i2p-error
jpk68:human-readable-timespan
jpk68:fix-log
jpk68:dead-prs
jpk68:markdown-link
jpk68:monerod-conf
jpk68:device-typos
Owner
Copy link

Replaces usage of the WIN32 macro with _WIN32 instead. The former is user-defined and seems to be generally considered somewhat unsafe; the latter is defined by the compiler.

See: https://stackoverflow.com/a/74084728

Replaces usage of the `WIN32` macro with `_WIN32` instead. The former is user-defined and seems to be generally considered somewhat unsafe; the latter is defined by the compiler. See: https://stackoverflow.com/a/74084728
jpk68 changed title from (削除) common: use compiler-defined win32 macro (削除ここまで) to src: use compiler-defined win32 macro 2026年05月11日 15:50:00 +02:00
This pull request has changes conflicting with the target branch.
  • src/common/util.cpp
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin remove-win32:remove-win32
git switch remove-win32

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch master
git merge --no-ff remove-win32
git switch remove-win32
git rebase master
git switch master
git merge --ff-only remove-win32
git switch remove-win32
git rebase master
git switch master
git merge --no-ff remove-win32
git switch master
git merge --squash remove-win32
git switch master
git merge --ff-only remove-win32
git switch master
git merge remove-win32
git push origin master
Sign in to join this conversation.
No reviewers
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
jpk68/monero!17
Reference in a new issue
jpk68/monero
No description provided.
Delete branch "remove-win32"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?