diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2020-10-22 16:59:15 -0700 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2020-10-22 16:59:15 -0700 |
| commit | 569f7ce49ea778864636316cfe41acb3944cf3d4 (patch) | |
| tree | a54f7eb5f3e57b5d774bb05d7f5c663efb2f52b8 /src/Cache.zig | |
| parent | ddd39b994b1eb9751d06227c6db02f15a5f71e9f (diff) | |
| parent | 127fa8009011e19d552ffdd834c6a607498f1c1e (diff) | |
| download | zig-569f7ce49ea778864636316cfe41acb3944cf3d4.tar.gz zig-569f7ce49ea778864636316cfe41acb3944cf3d4.zip | |
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.
Diffstat (limited to 'src/Cache.zig')
0 files changed, 0 insertions, 0 deletions