Auto merge of #2965 - semarie:locale, r=JohnTitor

openbsd: add more locale constants for use with newlocale()
rust-lang · Oct 18, 2022 · 1e07687 · 1e07687
2 parents ce0d407 + 21f11f3
commit 1e07687
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git 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
@@ -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