diff options
| author | bors <bors@rust-lang.org> | 2014-05-10 12:31:35 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-05-10 12:31:35 -0700 |
| commit | 11571cd9c1cde63c3b46ca65e608b84647785ac8 (patch) | |
| tree | 2ceddb6dde202994aae881edf7a706dcb252b562 /src/liblibc | |
| parent | 1001635dc1be7ee7c42800e7e2e537a811280c8a (diff) | |
| parent | 4cbd7754ea7277aa3e4ae20492e2bfca81e4cd11 (diff) | |
| download | rust-11571cd9c1cde63c3b46ca65e608b84647785ac8.tar.gz rust-11571cd9c1cde63c3b46ca65e608b84647785ac8.zip | |
auto merge of #14081 : Manishearth/rust/c-schar-reexport, r=huonw
Don't merge this until #14076 merges, since it is based on top of that branch to avoid merge conflicts.
Diffstat (limited to 'src/liblibc')
| -rw-r--r-- | src/liblibc/lib.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/liblibc/lib.rs b/src/liblibc/lib.rs index 5f67be22068..e2b647f87a5 100644 --- a/src/liblibc/lib.rs +++ b/src/liblibc/lib.rs @@ -92,8 +92,8 @@ pub use types::os::common::bsd44::{addrinfo, in_addr, in6_addr, sockaddr_storage pub use types::os::common::bsd44::{ip_mreq, ip6_mreq, sockaddr, sockaddr_un}; pub use types::os::common::bsd44::{sa_family_t, sockaddr_in, sockaddr_in6, socklen_t}; pub use types::os::arch::c95::{c_char, c_double, c_float, c_int, c_uint}; -pub use types::os::arch::c95::{c_long, c_short, c_uchar, c_ulong}; -pub use types::os::arch::c95::{c_ushort, clock_t, ptrdiff_t}; +pub use types::os::arch::c95::{c_long, c_short, c_uchar, c_ulong, wchar_t}; +pub use types::os::arch::c95::{c_ushort, clock_t, ptrdiff_t, c_schar}; pub use types::os::arch::c95::{size_t, time_t, suseconds_t}; pub use types::os::arch::c99::{c_longlong, c_ulonglong}; pub use types::os::arch::c99::{intptr_t, uintptr_t}; |
