Skip to content

Commit 568d40f

Browse files
committed
glob_t recently changed to conform posix (use size_t)
1 parent a5c20d6 commit 568d40f

File tree

3 files changed

+30
-15
lines changed

3 files changed

+30
-15
lines changed

src/unix/bsd/netbsdlike/openbsdlike/bitrig/mod.rs

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,21 @@
11
pub type c_char = i8;
22

33
s! {
4+
pub struct glob_t {
5+
pub gl_pathc: ::c_int,
6+
pub gl_matchc: ::c_int,
7+
pub gl_offs: ::c_int,
8+
pub gl_flags: ::c_int,
9+
pub gl_pathv: *mut *mut ::c_char,
10+
__unused1: *mut ::c_void,
11+
__unused2: *mut ::c_void,
12+
__unused3: *mut ::c_void,
13+
__unused4: *mut ::c_void,
14+
__unused5: *mut ::c_void,
15+
__unused6: *mut ::c_void,
16+
__unused7: *mut ::c_void,
17+
}
18+
419
pub struct lconv {
520
pub decimal_point: *mut ::c_char,
621
pub thousands_sep: *mut ::c_char,

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

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -34,21 +34,6 @@ s! {
3434
pub sin_zero: [::int8_t; 8],
3535
}
3636

37-
pub struct glob_t {
38-
pub gl_pathc: ::c_int,
39-
pub gl_matchc: ::c_int,
40-
pub gl_offs: ::c_int,
41-
pub gl_flags: ::c_int,
42-
pub gl_pathv: *mut *mut ::c_char,
43-
__unused1: *mut ::c_void,
44-
__unused2: *mut ::c_void,
45-
__unused3: *mut ::c_void,
46-
__unused4: *mut ::c_void,
47-
__unused5: *mut ::c_void,
48-
__unused6: *mut ::c_void,
49-
__unused7: *mut ::c_void,
50-
}
51-
5237
pub struct kevent {
5338
pub ident: ::uintptr_t,
5439
pub filter: ::c_short,

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,19 @@
11
s! {
2+
pub struct glob_t {
3+
pub gl_pathc: ::size_t,
4+
pub gl_matchc: ::size_t,
5+
pub gl_offs: ::size_t,
6+
pub gl_flags: ::c_int,
7+
pub gl_pathv: *mut *mut ::c_char,
8+
__unused1: *mut ::c_void,
9+
__unused2: *mut ::c_void,
10+
__unused3: *mut ::c_void,
11+
__unused4: *mut ::c_void,
12+
__unused5: *mut ::c_void,
13+
__unused6: *mut ::c_void,
14+
__unused7: *mut ::c_void,
15+
}
16+
217
pub struct lconv {
318
pub decimal_point: *mut ::c_char,
419
pub thousands_sep: *mut ::c_char,

0 commit comments

Comments
 (0)