Fix #if *_ENABLED inconsistencies, should check if defined
#87286
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
YuriSizov
approved these changes
Jan 17, 2024
Co-authored-by: Caroline Joy Bell <halotroop2288@proton.me>
akien-mga
force-pushed
the
fix-preprocessor-if-ENABLED-checks
branch
from
33a7e8a
to
0a7579b
Compare
akien-mga
commented
Jan 17, 2024
| "Windows": "#ifdef WINDOWS_ENABLED", | ||
| "Mac OS X": "#ifdef MACOS_ENABLED", | ||
| "Android": "#if defined(__ANDROID__)", | ||
| "Android": "#ifdef ANDROID_ENABLED", |
There was a problem hiding this comment.
I added this, which is the only functional change in this PR.
I couldn't see a reason why this one used a compiler-provided macro instead of our own like other platforms.
I guess at the time it was authored we might not have had an ANDROID_ENABLED define yet? Or it was just an oversight.
There was a problem hiding this comment.
There was a problem hiding this comment.
which already had the
ANDROID_ENABLEDdefine
Well, we had it since GODOT IS OPEN SOURCE, so I think your assessment is correct. It's strange, because it's inconsistent, but you'd have to ask Ariel about it, because it originates from 0d80726. 🙃
|
Thanks! |
Merged
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.
Redo and extension of #87272 for the
masterbranch.See #87272 (comment) for rationale.
This shouldn't change behavior, but makes things consistent with the rest of the codebase and less error prone.