diff options
| author | bors <bors@rust-lang.org> | 2022-10-18 11:25:52 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-10-18 11:25:52 +0000 |
| commit | 1e07687d273ce1159a6a4196ffbd61a50ddadb6f (patch) | |
| tree | 69613938913a24ed3ee54feb099381231176dfaa | |
| parent | ce0d4079b249c612c9a9ed95dbd1bb40e2080713 (diff) | |
| parent | 21f11f35070e8034b516f3fe1f2b4e29200f6241 (diff) | |
| download | rust-libc-1e07687d273ce1159a6a4196ffbd61a50ddadb6f.tar.gz | |
Auto merge of #2965 - semarie:locale, r=JohnTitor
openbsd: add more locale constants for use with newlocale()
| -rw-r--r-- | libc-test/semver/openbsd.txt | 8 | ||||
| -rw-r--r-- | src/unix/bsd/netbsdlike/openbsd/mod.rs | 12 |
2 files changed, 20 insertions, 0 deletions
diff --git a/libc-test/semver/openbsd.txt b/libc-test/semver/openbsd.txt index cf9d73c586..bdfd1b7744 100644 --- a/libc-test/semver/openbsd.txt +++ b/libc-test/semver/openbsd.txt @@ -446,12 +446,20 @@ KI_MAXLOGNAME KI_NGROUPS KI_WMESGLEN LC_ALL +LC_ALL_MASK LC_COLLATE +LC_COLLATE_MASK LC_CTYPE +LC_CTYPE_MASK +LC_GLOBAL_LOCALE LC_MESSAGES +LC_MESSAGES_MASK LC_MONETARY +LC_MONETARY_MASK LC_NUMERIC +LC_NUMERIC_MASK LC_TIME +LC_TIME_MASK LOG_AUTHPRIV LOG_CRON LOG_FTP diff --git a/src/unix/bsd/netbsdlike/openbsd/mod.rs b/src/unix/bsd/netbsdlike/openbsd/mod.rs index 506306e9f7..f63ad9e638 100644 --- a/src/unix/bsd/netbsdlike/openbsd/mod.rs +++ b/src/unix/bsd/netbsdlike/openbsd/mod.rs @@ -1643,6 +1643,18 @@ pub const MNT_WAIT: ::c_int = 1; pub const MNT_NOWAIT: ::c_int = 2; pub const MNT_LAZY: ::c_int = 3; +pub const LC_COLLATE_MASK: ::c_int = 1 << ::LC_COLLATE; +pub const LC_CTYPE_MASK: ::c_int = 1 << ::LC_CTYPE; +pub const LC_MONETARY_MASK: ::c_int = 1 << ::LC_MONETARY; +pub const LC_NUMERIC_MASK: ::c_int = 1 << ::LC_NUMERIC; +pub const LC_TIME_MASK: ::c_int = 1 << ::LC_TIME; +pub const LC_MESSAGES_MASK: ::c_int = 1 << ::LC_MESSAGES; + +const _LC_LAST: ::c_int = 7; +pub const LC_ALL_MASK: ::c_int = (1 << _LC_LAST) - 2; + +pub const LC_GLOBAL_LOCALE: ::locale_t = -1isize as ::locale_t; + const_fn! { {const} fn _ALIGN(p: usize) -> usize { (p + _ALIGNBYTES) & !_ALIGNBYTES |