summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-01-08 15:05:51 +0000
committerbors <bors@rust-lang.org>2018-01-08 15:05:51 +0000
commit2b4cd1016bdba92becb4f982a4dcb18fe6653bc4 (patch)
tree5286578624641d0b8f40cc65655a3d322a8c5b75
parentd73af993723203e0895ac740160fe4daf14e5cc7 (diff)
parent63bb3f482ddddfc31df267dc31b35c89a137dffb (diff)
downloadrust-libc-2b4cd1016bdba92becb4f982a4dcb18fe6653bc4.tar.gz
Auto merge of #889 - EdSchouten:cloudabi-time_t, r=alexcrichton
Add time_t for CloudABI. Even though this data type is not used by libstd in any platform independent code, one of the unit tests in src/libstd/time/mod.rs refers to it. Instead of making that unit test more complicated, simply add time_t, matching the type used by the C library.
-rw-r--r--src/cloudabi/mod.rs1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/cloudabi/mod.rs b/src/cloudabi/mod.rs
index bb4b9fa301..1d8875f922 100644
--- a/src/cloudabi/mod.rs
+++ b/src/cloudabi/mod.rs
@@ -4,6 +4,7 @@ pub type pthread_key_t = usize;
pub type pthread_t = usize;
pub type sa_family_t = u8;
pub type socklen_t = usize;
+pub type time_t = i64;
s! {
pub struct addrinfo {