Skip to content

Commit

Permalink
Merge #1831
Browse files Browse the repository at this point in the history
1831: re-export RLIM_INFINITY from libc r=rtzoeller a=SteveLauC

Fixes #1803 

Co-authored-by: Steve Lau <stevelauc@outlook.com>
  • Loading branch information
bors[bot] and SteveLauC committed Oct 3, 2022
2 parents 76f04df + 5ec038e commit 482a596
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Expand Up @@ -18,6 +18,8 @@ This project adheres to [Semantic Versioning](https://semver.org/).
([#1808](https://github.com/nix-rust/nix/pull/1808))
- Added `domainname` field of `UtsName` on Android and Linux
([#1817](https://github.com/nix-rust/nix/pull/1817))
- Re-export `RLIM_INFINITY` from `libc`
([#1831](https://github.com/nix-rust/nix/pull/1831))

### Changed

Expand Down
5 changes: 3 additions & 2 deletions src/sys/resource.rs
Expand Up @@ -6,6 +6,7 @@ use crate::errno::Errno;
use crate::sys::time::TimeVal;
use crate::Result;
pub use libc::rlim_t;
pub use libc::RLIM_INFINITY;
use std::mem;

cfg_if! {
Expand Down Expand Up @@ -175,7 +176,7 @@ libc_enum! {

/// Get the current processes resource limits
///
/// The special value `RLIM_INFINITY` indicates that no limit will be
/// The special value [`RLIM_INFINITY`] indicates that no limit will be
/// enforced.
///
/// # Parameters
Expand Down Expand Up @@ -224,7 +225,7 @@ pub fn getrlimit(resource: Resource) -> Result<(rlim_t, rlim_t)> {
/// * `hard_limit`: The ceiling for the soft limit. Must be lower or equal to
/// the current hard limit for non-root users.
///
/// The special value `RLIM_INFINITY` indicates that no limit will be
/// The special value [`RLIM_INFINITY`] indicates that no limit will be
/// enforced.
///
/// # Examples
Expand Down

0 comments on commit 482a596

Please sign in to comment.