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.

Sign up for GitHub

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
Merged

Do not redefine _FILE_STAT_LX_INFORMATION #5092

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions compat/win32/wsl.c
View file
Original file line number Diff line number Diff line change
@@ -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

#define LX_FILE_METADATA_HAS_UID 0x1
#define LX_FILE_METADATA_HAS_GID 0x2
#define LX_FILE_METADATA_HAS_MODE 0x4
@@ -78,6 +79,7 @@ typedef struct _FILE_STAT_LX_INFORMATION {
uint32_t LxDeviceIdMajor;
uint32_t LxDeviceIdMinor;
} FILE_STAT_LX_INFORMATION, *PFILE_STAT_LX_INFORMATION;
#endif

/*
* This struct is extended from the original FILE_FULL_EA_INFORMATION of
Loading