# Merge branch 'improve-windows-networking' · gitcafe/zig

[View on GitCafe](https://git.cafe/gitcafe/zig/commit/569f7ce49ea778864636316cfe41acb3944cf3d4)

Repository: [gitcafe/zig](https://git.cafe/gitcafe/zig)

Visibility: public

Requested revision: 569f7ce49ea778864636316cfe41acb3944cf3d4

Requested commit: 569f7ce49ea778864636316cfe41acb3944cf3d4

Commit: 569f7ce49ea778864636316cfe41acb3944cf3d4

Tree: a54f7eb5f3e57b5d774bb05d7f5c663efb2f52b8

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

```
Merge branch 'improve-windows-networking'

of https://github.com/BarabasGitHub/zig into
BarabasGitHub-improve-windows-networking

Conflicts:
 lib/std/os.zig

This commit resolves conflicts with the changes to std.os which removed
the EAGAIN error handling interactions with the event loop. The solution
to the conflict was to apply EAGAIN => return error.WouldBlock into the
improved windows networking branch.

```

## Parents

- [ddd39b994b1eb9751d06227c6db02f15a5f71e9f](https://git.cafe/gitcafe/zig/commit/ddd39b994b1eb9751d06227c6db02f15a5f71e9f?format=markdown)

- [127fa8009011e19d552ffdd834c6a607498f1c1e](https://git.cafe/gitcafe/zig/commit/127fa8009011e19d552ffdd834c6a607498f1c1e?format=markdown)

[Source at this commit](https://git.cafe/gitcafe/zig/tree/569f7ce49ea778864636316cfe41acb3944cf3d4?format=markdown)