summaryrefslogtreecommitdiffstats
path: root/third_party/rust/nix/src/env.rs
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-06-12 05:43:14 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-06-12 05:43:14 +0000
commit8dd16259287f58f9273002717ec4d27e97127719 (patch)
tree3863e62a53829a84037444beab3abd4ed9dfc7d0 /third_party/rust/nix/src/env.rs
parentReleasing progress-linux version 126.0.1-1~progress7.99u1. (diff)
downloadfirefox-8dd16259287f58f9273002717ec4d27e97127719.tar.xz
firefox-8dd16259287f58f9273002717ec4d27e97127719.zip
Merging upstream version 127.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'third_party/rust/nix/src/env.rs')
-rw-r--r--third_party/rust/nix/src/env.rs7
1 files changed, 3 insertions, 4 deletions
diff --git a/third_party/rust/nix/src/env.rs b/third_party/rust/nix/src/env.rs
index 95177a1d2a..510bbb0924 100644
--- a/third_party/rust/nix/src/env.rs
+++ b/third_party/rust/nix/src/env.rs
@@ -40,13 +40,12 @@ impl std::error::Error for ClearEnvError {}
/// thread safety must still be upheld.
pub unsafe fn clearenv() -> std::result::Result<(), ClearEnvError> {
cfg_if! {
- if #[cfg(any(target_os = "fuchsia",
+ if #[cfg(any(linux_android,
+ target_os = "fuchsia",
target_os = "wasi",
target_env = "uclibc",
- target_os = "linux",
- target_os = "android",
target_os = "emscripten"))] {
- let ret = libc::clearenv();
+ let ret = unsafe { libc::clearenv() };
} else {
use std::env;
for (name, _) in env::vars_os() {