diff options
| author | bors <bors@rust-lang.org> | 2018-01-12 15:08:43 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-01-12 15:08:43 +0000 |
| commit | 16a0f4a3d6c836f88f50c58f5d0a74a32cbf0193 (patch) | |
| tree | fe092fcb315791489012dc6d31d350022d1df6f0 | |
| parent | 27430bc4926c90d92e099902574a9bb208c56f86 (diff) | |
| parent | e91769eceb2b4e1e37a7e66a4f3ceed4055a08df (diff) | |
| download | rust-libc-16a0f4a3d6c836f88f50c58f5d0a74a32cbf0193.tar.gz | |
Auto merge of #895 - GuillaumeGomez:difftime, r=alexcrichton0.2.36
Difftime
Once merged, can you update the crate too please?
| -rw-r--r-- | Cargo.lock | 4 | ||||
| -rw-r--r-- | Cargo.toml | 2 | ||||
| -rw-r--r-- | src/unix/mod.rs | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/Cargo.lock b/Cargo.lock index 202e57695e..d6f736584a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -78,14 +78,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "libc" -version = "0.2.35" +version = "0.2.36" [[package]] name = "libc-test" version = "0.1.0" dependencies = [ "ctest 0.1.6 (git+https://github.com/alexcrichton/ctest)", - "libc 0.2.35", + "libc 0.2.36", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index f2fa309def..c9be8322e5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "libc" -version = "0.2.35" +version = "0.2.36" authors = ["The Rust Project Developers"] license = "MIT/Apache-2.0" readme = "README.md" diff --git a/src/unix/mod.rs b/src/unix/mod.rs index 35a7f448ec..57067e02c8 100644 --- a/src/unix/mod.rs +++ b/src/unix/mod.rs @@ -767,6 +767,8 @@ extern { pub fn gmtime(time_p: *const time_t) -> *mut tm; #[cfg_attr(target_os = "netbsd", link_name = "__locatime50")] pub fn localtime(time_p: *const time_t) -> *mut tm; + #[cfg_attr(target_os = "netbsd", link_name = "__difftime50")] + pub fn difftime(time1: time_t, time0: time_t) -> ::c_double; #[cfg_attr(target_os = "netbsd", link_name = "__mknod50")] pub fn mknod(pathname: *const ::c_char, mode: ::mode_t, |