Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't include flock support on Solaris #3310

Closed

Conversation

inferiorhumanorgans
Copy link
Contributor

This should disable the flock wrapper and related consts on Solaris, but leave them in place for OpenSolaris derivatives like Illumos which do have a BSD-esque flock.

@rustbot
Copy link
Collaborator

rustbot commented Jul 30, 2023

r? @JohnTitor

(rustbot has picked a reviewer for you, use r? to override)

@rustbot
Copy link
Collaborator

rustbot commented Jul 30, 2023

Some changes occurred in solarish module

cc @jclulow, @pfmooney

Disable the flock wrapper and related consts on Solaris, but leave
them in place for OpenSolaris derivatives like Illumos which do have
a BSD-esque flock.
src/unix/solarish/mod.rs Outdated Show resolved Hide resolved
src/unix/mod.rs Show resolved Hide resolved
@JohnTitor
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Aug 20, 2023

📌 Commit 076f240 has been approved by JohnTitor

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Aug 20, 2023

⌛ Testing commit 076f240 with merge 65b16b3...

bors added a commit that referenced this pull request Aug 20, 2023
Don't include flock support on Solaris

This should disable the flock wrapper and related consts on Solaris, but leave them in place for OpenSolaris derivatives like Illumos which do have a BSD-esque flock.
@bors
Copy link
Contributor

bors commented Aug 20, 2023

💔 Test failed - checks-cirrus-freebsd-13

@inferiorhumanorgans
Copy link
Contributor Author

  error: macros cannot expand to foreign items
      --> ../src/unix/mod.rs:1070:5
       |
  1070 | /     cfg_if! {
  1071 | |         if #[cfg(not(target_os = "solaris"))] {
  1072 | |             pub fn flock(fd: ::c_int, operation: ::c_int) -> ::c_int;
  1073 | |         }
  1074 | |     }
       | |_____^

So is the answer to pull this out of a cfg_if block?

@JohnTitor
Copy link
Member

Yeah, that should resolve the error.
@bors r-
@rustbot author

@JohnTitor
Copy link
Member

Triage: Closing as inactive, feel free to re-submit a new PR if you're still interested in this change. Thank you anyway!

@JohnTitor JohnTitor closed this Jan 4, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants