Skip to content
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.

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

Do not redefine _FILE_STAT_LX_INFORMATION #5092

Merged
merged 1 commit into from
Aug 7, 2024

Conversation

csware
Copy link

@csware csware commented Aug 3, 2024

The struct definition as well as the other defines are already defined in Windows SDK >= 10.1.26100.1.

@csware csware changed the title Do not redefine _FILE_STAT_LX_INFORMATION WIP: Do not redefine _FILE_STAT_LX_INFORMATION Aug 3, 2024
@csware csware changed the title WIP: Do not redefine _FILE_STAT_LX_INFORMATION Do not redefine _FILE_STAT_LX_INFORMATION Aug 3, 2024
Copy link
Member

@dscho dscho left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for this patch! Just one minor request before it's ready to merge.

@@ -54,6 +54,7 @@ int copy_wsl_mode_bits_from_disk(const wchar_t *wpath, ssize_t wpathlen,
return ret;
}

#ifndef LX_FILE_METADATA_HAS_UID
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since this modifies a file that is not part of upstream Git yet, could you please mark this as a fixup! of 8342d6d instead of making it a stand-alone patch?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

@csware csware force-pushed the fix-already-defined branch from de2ebae to 6b262fb Compare August 6, 2024 16:17
@dscho dscho added this to the Next release milestone Aug 7, 2024
@dscho dscho merged commit 059f0c9 into git-for-windows:main Aug 7, 2024
44 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants