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

compat/poll: prepare for targeting Windows Vista #32

Merged
merged 1 commit into from
Oct 8, 2018

Conversation

derrickstolee
Copy link
Collaborator

Windows Vista (and later) actually have a working poll(), but we still
cannot use it because it only works on sockets.

So let's detect when we are targeting Windows Vista and undefine those
constants, and define pollfd so that we can declare our own pollfd
struct.

We also need to make sure that we override those constants after
winsock2.h has been #included (otherwise we would not really
override those constants).

(Stolen from @jeffhostetler's PR, thanks to @dscho)

Windows Vista (and later) actually have a working poll(), but we still
cannot use it because it only works on sockets.

So let's detect when we are targeting Windows Vista and undefine those
constants, and define `pollfd` so that we can declare our own pollfd
struct.

We also need to make sure that we override those constants *after*
`winsock2.h` has been `#include`d (otherwise we would not really
override those constants).

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@derrickstolee
Copy link
Collaborator Author

I created this PR because our builds are broken without it! My unrelated changes were not building on Windows.

Copy link

@jeffhostetler jeffhostetler left a comment

Choose a reason for hiding this comment

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

Yes, we need this. In @dscho 's patch submission to the mailing list there were 2 other commits that
adjusted WIN32_WINNT version, but I think we already have them in our tree.

@jeffhostetler jeffhostetler merged commit ba58049 into microsoft:gvfs-2.19.0 Oct 8, 2018
derrickstolee added a commit to microsoft/VFSForGit that referenced this pull request Oct 12, 2018
…racked files

Update the package for GitForWindows to include tracing information.

Includes the following Git PRs:

* [36 Avoid `sane_execvp` in `git rebase` and `git stash`](microsoft/git#36)
* [34 Add Trace2 regions to 'pack-objects'](microsoft/git#34)
* [28 Trace2 base plus GVFS extensions](microsoft/git#28)
* [33 virtualfilesystem: check if directory is included](microsoft/git#33)
* [31 Revert "gvfs: add a perf test for reading the index"](microsoft/git#31)
* [32 compat/poll: prepare for targeting Windows Vista](microsoft/git#32)
* [22 Enable the filesystem cache (fscache) in refresh_index()](microsoft/git#22)
* [27 virtualfilesystem: fix bug with symlinks being ignored](microsoft/git#27)
* [23 Unpack trees with cache tree gvfs](microsoft/git#23)
* [15 virtualfilesystem: don't run the virtual file system hook if the index has been redirected](microsoft/git#15)
* Includes Git 2.19.0.

This also includes VFS for Git updates from Kevin Willford's work:

**Fix missing untracked files when created in subfolder**

Add to the test to create multiple level of folders and files in those folder to make sure they show up as untracked files.

Update the git for windows version that has the fix.

Fixes #358
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.

3 participants