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

More Socket Defines for Darwin #1272

Merged
merged 4 commits into from Jul 22, 2018

Conversation

kristate
Copy link
Contributor

Please commit. Will add more as I go along.

tracking issue #1271

@kristate
Copy link
Contributor Author

I committed darwin_socket.zig but the following error was produced in the CI?

error: unable to find 'darwin_socket.zig' pub use @import("darwin_socket.zig");

@Hejsil
Copy link
Sponsor Contributor

Hejsil commented Jul 21, 2018

@kristate I think you need to add the file to cmake:

zig/CMakeLists.txt

Lines 431 to 435 in 1f4c7d5

set(ZIG_STD_FILES
"array_list.zig"
"atomic/index.zig"
"atomic/int.zig"
"atomic/queue.zig"

@kristate
Copy link
Contributor Author

@Hejsil Thanks -- all tests pass!

@andrewrk andrewrk merged commit 501dd5f into ziglang:master Jul 22, 2018
@andrewrk
Copy link
Member

Thanks for the PR!

Here's some stuff I did:

  • I went ahead and made a std/os/darwin/ directory to match the linux and windows directories, and moved darwin_errno.zig to that dir.
  • I started experimenting with a new convention - instead of having std/os/darwin/index.zig, I kept std/os/darwin.zig. If we like this convention, we'll switch the rest of the std lib over to it.
  • I moved the constants from darwin_socket.zig directly into darwin.zig. That's what we've been doing for the equivalent linux constants. If there's a good reason to separate them into another file, we can put it back how you had it, no problem.

@kristate kristate deleted the posix-darwin-issue1271 branch August 2, 2018 17:21
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.

None yet

3 participants