diff options
| author | bors <bors@rust-lang.org> | 2021-03-04 16:57:45 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-03-04 16:57:45 +0000 |
| commit | 3a7135f491b8faac564c13e7d0c5fd6b10e03855 (patch) | |
| tree | 48b5821b5e2c45327cc95d52e62c5dd8abc36717 | |
| parent | ec86e5fb3258a844ece771d2c6f0fbf152086eab (diff) | |
| parent | b719be41508f18b7abd7b521b7f555773c02d1fe (diff) | |
| download | rust-libc-3a7135f491b8faac564c13e7d0c5fd6b10e03855.tar.gz | |
Auto merge of #2100 - TheDoctor314:gettid, r=JohnTitor
Add gettid() for Linux
Fixes #2076
| -rwxr-xr-x | libc-test/build.rs | 3 | ||||
| -rw-r--r-- | src/unix/linux_like/android/mod.rs | 2 | ||||
| -rw-r--r-- | src/unix/linux_like/linux/mod.rs | 2 |
3 files changed, 7 insertions, 0 deletions
diff --git a/libc-test/build.rs b/libc-test/build.rs index 71b7063282..99763e29aa 100755 --- a/libc-test/build.rs +++ b/libc-test/build.rs @@ -2737,6 +2737,9 @@ fn test_linux(target: &str) { // assume it's a int instead. "getnameinfo" if uclibc => true, + // FIXME: This needs musl 1.2.2 or later. + "gettid" if musl => true, + _ => false, } }); diff --git a/src/unix/linux_like/android/mod.rs b/src/unix/linux_like/android/mod.rs index a005ee632f..f1d6ef4b2b 100644 --- a/src/unix/linux_like/android/mod.rs +++ b/src/unix/linux_like/android/mod.rs @@ -2809,6 +2809,8 @@ extern "C" { pub fn regfree(preg: *mut ::regex_t); pub fn android_set_abort_message(msg: *const ::c_char); + + pub fn gettid() -> ::pid_t; } cfg_if! { diff --git a/src/unix/linux_like/linux/mod.rs b/src/unix/linux_like/linux/mod.rs index efd7a8ed8d..ce71f1c7ef 100644 --- a/src/unix/linux_like/linux/mod.rs +++ b/src/unix/linux_like/linux/mod.rs @@ -3594,6 +3594,8 @@ extern "C" { outbytesleft: *mut ::size_t, ) -> ::size_t; pub fn iconv_close(cd: iconv_t) -> ::c_int; + + pub fn gettid() -> ::pid_t; } cfg_if! { |