Skip to content

Commit 1e07687

Browse files
committed
Auto merge of #2965 - semarie:locale, r=JohnTitor
openbsd: add more locale constants for use with newlocale()
2 parents ce0d407 + 21f11f3 commit 1e07687

File tree

2 files changed

+20
-0
lines changed

2 files changed

+20
-0
lines changed

libc-test/semver/openbsd.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -446,12 +446,20 @@ KI_MAXLOGNAME
446446
KI_NGROUPS
447447
KI_WMESGLEN
448448
LC_ALL
449+
LC_ALL_MASK
449450
LC_COLLATE
451+
LC_COLLATE_MASK
450452
LC_CTYPE
453+
LC_CTYPE_MASK
454+
LC_GLOBAL_LOCALE
451455
LC_MESSAGES
456+
LC_MESSAGES_MASK
452457
LC_MONETARY
458+
LC_MONETARY_MASK
453459
LC_NUMERIC
460+
LC_NUMERIC_MASK
454461
LC_TIME
462+
LC_TIME_MASK
455463
LOG_AUTHPRIV
456464
LOG_CRON
457465
LOG_FTP

src/unix/bsd/netbsdlike/openbsd/mod.rs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1643,6 +1643,18 @@ pub const MNT_WAIT: ::c_int = 1;
16431643
pub const MNT_NOWAIT: ::c_int = 2;
16441644
pub const MNT_LAZY: ::c_int = 3;
16451645

1646+
pub const LC_COLLATE_MASK: ::c_int = 1 << ::LC_COLLATE;
1647+
pub const LC_CTYPE_MASK: ::c_int = 1 << ::LC_CTYPE;
1648+
pub const LC_MONETARY_MASK: ::c_int = 1 << ::LC_MONETARY;
1649+
pub const LC_NUMERIC_MASK: ::c_int = 1 << ::LC_NUMERIC;
1650+
pub const LC_TIME_MASK: ::c_int = 1 << ::LC_TIME;
1651+
pub const LC_MESSAGES_MASK: ::c_int = 1 << ::LC_MESSAGES;
1652+
1653+
const _LC_LAST: ::c_int = 7;
1654+
pub const LC_ALL_MASK: ::c_int = (1 << _LC_LAST) - 2;
1655+
1656+
pub const LC_GLOBAL_LOCALE: ::locale_t = -1isize as ::locale_t;
1657+
16461658
const_fn! {
16471659
{const} fn _ALIGN(p: usize) -> usize {
16481660
(p + _ALIGNBYTES) & !_ALIGNBYTES

0 commit comments

Comments
 (0)