Skip to content

Conversation

@mrhota
Copy link
Contributor

@mrhota mrhota commented Apr 1, 2016

No description provided.

@rust-highfive
Copy link

r? @alexcrichton

(rust_highfive has picked a reviewer for you, use r? to override)

@mrhota
Copy link
Contributor Author

mrhota commented Apr 1, 2016

not done yet; I wanted to make sure basic types were correct

@mrhota
Copy link
Contributor Author

mrhota commented Apr 1, 2016

I guess I could test this locally instead of wasting CI cycles 😉

I just figured out how to run the build locally. Silly me!

cfg.header("dirent.h");
if openbsd {
cfg.header("sys/socket.h");
} else if !netbsd {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I forgot to remove this.

@alexcrichton
Copy link
Member

Thanks! Can you also squash the commits down? Other than that r=me

@mrhota
Copy link
Contributor Author

mrhota commented Apr 2, 2016

ok, @alexcrichton, thanks for your patience. I think we're good to go!

@alexcrichton
Copy link
Member

@bors: r+ aa8f306

@bors
Copy link
Contributor

bors commented Apr 3, 2016

🔒 Merge conflict

@bors
Copy link
Contributor

bors commented Apr 3, 2016

☔ The latest upstream changes (presumably #246) made this pull request unmergeable. Please resolve the merge conflicts.

@bors
Copy link
Contributor

bors commented Apr 3, 2016

☔ The latest upstream changes (presumably #247) made this pull request unmergeable. Please resolve the merge conflicts.

There are many constants defined by langinfo, but we have the
new types, locale_t and nl_item.

We also have several functions, not all of which exist for every
platform:

nl_langinfo
nl_langinfo_l
newlocale
duplocale
freelocale
uselocale
querylocale
@mrhota
Copy link
Contributor Author

mrhota commented Apr 5, 2016

@alexcrichton r?

@alexcrichton
Copy link
Member

@bors: r+ 24c84f1

@bors
Copy link
Contributor

bors commented Apr 5, 2016

⌛ Testing commit 24c84f1 with merge c2d1c71...

bors added a commit that referenced this pull request Apr 5, 2016
@bors
Copy link
Contributor

bors commented Apr 5, 2016

☀️ Test successful - status-appveyor, travis

@bors bors merged commit 24c84f1 into rust-lang:master Apr 5, 2016
@mrhota mrhota deleted the langinfo branch January 25, 2020 22:32
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.

4 participants