Skip to content

Commit 4f584cf

Browse files
semariembyx
authored andcommitted
OpenBSD: const correct tm_zone in struct tm
openbsd/src@4a796cf
1 parent 4d56051 commit 4f584cf

File tree

5 files changed

+56
-14
lines changed

5 files changed

+56
-14
lines changed

src/unix/bsd/apple/mod.rs

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,20 @@ s! {
262262
__unused8: Padding<*mut c_void>,
263263
}
264264

265+
pub struct tm {
266+
pub tm_sec: c_int,
267+
pub tm_min: c_int,
268+
pub tm_hour: c_int,
269+
pub tm_mday: c_int,
270+
pub tm_mon: c_int,
271+
pub tm_year: c_int,
272+
pub tm_wday: c_int,
273+
pub tm_yday: c_int,
274+
pub tm_isdst: c_int,
275+
pub tm_gmtoff: c_long,
276+
pub tm_zone: *mut c_char,
277+
}
278+
265279
pub struct addrinfo {
266280
pub ai_flags: c_int,
267281
pub ai_family: c_int,

src/unix/bsd/freebsdlike/mod.rs

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,20 @@ s! {
121121
__unused8: Padding<*mut c_void>,
122122
}
123123

124+
pub struct tm {
125+
pub tm_sec: c_int,
126+
pub tm_min: c_int,
127+
pub tm_hour: c_int,
128+
pub tm_mday: c_int,
129+
pub tm_mon: c_int,
130+
pub tm_year: c_int,
131+
pub tm_wday: c_int,
132+
pub tm_yday: c_int,
133+
pub tm_isdst: c_int,
134+
pub tm_gmtoff: c_long,
135+
pub tm_zone: *mut c_char,
136+
}
137+
124138
pub struct addrinfo {
125139
pub ai_flags: c_int,
126140
pub ai_family: c_int,

src/unix/bsd/mod.rs

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -74,20 +74,6 @@ s! {
7474
fds_bits: [i32; FD_SETSIZE as usize / 32],
7575
}
7676

77-
pub struct tm {
78-
pub tm_sec: c_int,
79-
pub tm_min: c_int,
80-
pub tm_hour: c_int,
81-
pub tm_mday: c_int,
82-
pub tm_mon: c_int,
83-
pub tm_year: c_int,
84-
pub tm_wday: c_int,
85-
pub tm_yday: c_int,
86-
pub tm_isdst: c_int,
87-
pub tm_gmtoff: c_long,
88-
pub tm_zone: *mut c_char,
89-
}
90-
9177
pub struct msghdr {
9278
pub msg_name: *mut c_void,
9379
pub msg_namelen: crate::socklen_t,

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,20 @@ s! {
161161
__unused8: Padding<*mut c_void>,
162162
}
163163

164+
pub struct tm {
165+
pub tm_sec: c_int,
166+
pub tm_min: c_int,
167+
pub tm_hour: c_int,
168+
pub tm_mday: c_int,
169+
pub tm_mon: c_int,
170+
pub tm_year: c_int,
171+
pub tm_wday: c_int,
172+
pub tm_yday: c_int,
173+
pub tm_isdst: c_int,
174+
pub tm_gmtoff: c_long,
175+
pub tm_zone: *mut c_char,
176+
}
177+
164178
pub struct mq_attr {
165179
pub mq_flags: c_long,
166180
pub mq_maxmsg: c_long,

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,20 @@ s! {
8484
__unused7: Padding<*mut c_void>,
8585
}
8686

87+
pub struct tm {
88+
pub tm_sec: c_int,
89+
pub tm_min: c_int,
90+
pub tm_hour: c_int,
91+
pub tm_mday: c_int,
92+
pub tm_mon: c_int,
93+
pub tm_year: c_int,
94+
pub tm_wday: c_int,
95+
pub tm_yday: c_int,
96+
pub tm_isdst: c_int,
97+
pub tm_gmtoff: c_long,
98+
pub tm_zone: *const c_char,
99+
}
100+
87101
pub struct lconv {
88102
pub decimal_point: *mut c_char,
89103
pub thousands_sep: *mut c_char,

0 commit comments

Comments
 (0)