Don't use on Solaris libc::LOCK_* which were removed from libc in version 0.2.162

Author: psumbera

src/cargo/util/flock.rs

@@ -430,30 +430,48 @@ fn is_on_nfs_mount(_path: &Path) -> bool {
  false
 }
 
+#[cfg(all(unix, not(target_os = "solaris")))]
+const LOCK_SH: i32 = libc::LOCK_SH;
+#[cfg(all(unix, target_os = "solaris"))]
+const LOCK_SH: i32 = 1;
+#[cfg(all(unix, not(target_os = "solaris")))]
+const LOCK_EX: i32 = libc::LOCK_EX;
+#[cfg(all(unix, target_os = "solaris"))]
+const LOCK_EX: i32 = 2;
+#[cfg(all(unix, not(target_os = "solaris")))]
+const LOCK_NB: i32 = libc::LOCK_NB;
+#[cfg(all(unix, target_os = "solaris"))]
+const LOCK_NB: i32 = 4;
+#[cfg(all(unix, not(target_os = "solaris")))]
+const LOCK_UN: i32 = libc::LOCK_UN;
+#[cfg(all(unix, target_os = "solaris"))]
+const LOCK_UN: i32 = 8;
+
 #[cfg(unix)]
 mod sys {
+ use crate::util::flock::{LOCK_EX, LOCK_NB, LOCK_SH, LOCK_UN};
  use std::fs::File;
  use std::io::{Error, Result};
  use std::os::unix::io::AsRawFd;
 
  pub(super) fn lock_shared(file: &File) -> Result<()> {
- flock(file, libc::LOCK_SH)
+ flock(file, LOCK_SH)
  }
 
  pub(super) fn lock_exclusive(file: &File) -> Result<()> {
- flock(file, libc::LOCK_EX)
+ flock(file, LOCK_EX)
  }
 
  pub(super) fn try_lock_shared(file: &File) -> Result<()> {
- flock(file, libc::LOCK_SH | libc::LOCK_NB)
+ flock(file, LOCK_SH | LOCK_NB)
  }
 
  pub(super) fn try_lock_exclusive(file: &File) -> Result<()> {
- flock(file, libc::LOCK_EX | libc::LOCK_NB)
+ flock(file, LOCK_EX | LOCK_NB)
  }
 
  pub(super) fn unlock(file: &File) -> Result<()> {
- flock(file, libc::LOCK_UN)
+ flock(file, LOCK_UN)
  }
 
  pub(super) fn error_contended(err: &Error) -> bool {
@@ -493,18 +511,18 @@ mod sys {
  l_pid: 0,
  l_pad: [0, 0, 0, 0],
  };
- flock.l_type = if flag & libc::LOCK_UN != 0 {
+ flock.l_type = if flag & LOCK_UN != 0 {
  libc::F_UNLCK
- } else if flag & libc::LOCK_EX != 0 {
+ } else if flag & LOCK_EX != 0 {
  libc::F_WRLCK
- } else if flag & libc::LOCK_SH != 0 {
+ } else if flag & LOCK_SH != 0 {
  libc::F_RDLCK
  } else {
  panic!("unexpected flock() operation")
  };
 
  let mut cmd = libc::F_SETLKW;
- if (flag & libc::LOCK_NB) != 0 {
+ if (flag & LOCK_NB) != 0 {
  cmd = libc::F_SETLK;
  }