mingw: Fix the MSYS1 build #164
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
In contrast to MSYS2, MSYS1 not only defines REPARSE_DATA_BUFFER in "ntifs.h" but also in "winnt.h". Luckily, we can distinguish between MSYS1's and MSYS2's "winnt.h" by looking at the include-guards: While MSYS1 defines "_WINNT_H", MSYS2 defines "_WINNT_". Signed-off-by: Sebastian Schuberth <[email protected]>
|
@kblees Can you please also have a look? |
|
Looks obviously correct to me. Thank you. |
|
Thanks, looks good to me. Just checked: Microsoft SDK's winnt.h also uses I just wondered if this is the only way to distinguish between MinGW and MinGW-w64. According to [1], maybe this would be better (haven't tried it though)?: |
This is indeed the appropriate guard if you want to add code specifically to be used with MinGW-w64. |
jeffhostetler
added a commit
to jeffhostetler/git
that referenced
this pull request
Aug 13, 2019
…unpack-trees-checkout-detail trace2:gvfs:experiment Add addition unpack_trees() and report_tracking() data
jeffhostetler
added a commit
to jeffhostetler/git
that referenced
this pull request
Jun 3, 2020
Includes gvfs-specific commits from these pull requests: git-for-windows#158 git-for-windows#159 git-for-windows#160 git-for-windows#164 Signed-off-by: Derrick Stolee <[email protected]>
jeffhostetler
added a commit
to jeffhostetler/git
that referenced
this pull request
May 14, 2021
Includes gvfs-specific commits from these pull requests: git-for-windows#158 git-for-windows#159 git-for-windows#160 git-for-windows#164 Signed-off-by: Derrick Stolee <[email protected]>
jeffhostetler
added a commit
to jeffhostetler/git
that referenced
this pull request
Jun 21, 2021
Includes gvfs-specific commits from these pull requests: git-for-windows#158 git-for-windows#159 git-for-windows#160 git-for-windows#164 Signed-off-by: Derrick Stolee <[email protected]>
jeffhostetler
added a commit
to jeffhostetler/git
that referenced
this pull request
Aug 18, 2021
Includes gvfs-specific commits from these pull requests: git-for-windows#158 git-for-windows#159 git-for-windows#160 git-for-windows#164 Signed-off-by: Derrick Stolee <[email protected]>
mjcheetham
pushed a commit
to mjcheetham/git
that referenced
this pull request
Jun 16, 2022
Includes gvfs-specific commits from these pull requests: git-for-windows#158 git-for-windows#159 git-for-windows#160 git-for-windows#164 Signed-off-by: Derrick Stolee <[email protected]>
mjcheetham
pushed a commit
to mjcheetham/git
that referenced
this pull request
Jul 23, 2024
Includes gvfs-specific commits from these pull requests: git-for-windows#158 git-for-windows#159 git-for-windows#160 git-for-windows#164 Signed-off-by: Derrick Stolee <[email protected]>
mjcheetham
pushed a commit
to mjcheetham/git
that referenced
this pull request
Jan 20, 2025
Includes gvfs-specific commits from these pull requests: git-for-windows#158 git-for-windows#159 git-for-windows#160 git-for-windows#164 Signed-off-by: Derrick Stolee <[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.
In contrast to MSYS2, MSYS1 not only defines REPARSE_DATA_BUFFER in
"ntifs.h" but also in "winnt.h". Luckily, we can distinguish between
MSYS1's and MSYS2's "winnt.h" by looking at the include-guards:
While MSYS1 defines "_WINNT_H", MSYS2 defines "WINNT".
Signed-off-by: Sebastian Schuberth [email protected]