OpenE2K/libc-rs
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Auto merge of #1280 - semarie:openbsd-glob_t, r=gnzlbg

Browse Source 
openbsd: glob_t recently changed to conform posix (use size_t)

on openbsd, upcoming stable version have changed glob_t definition to follow posix definition (using `size_t` instead of `int` on some fields)

the change preserves bitrig definition

r? @gnzlbg
This commit is contained in:
bors 2019-02-24 15:57:22 +00:00
commit 841dbe36a5
3 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/unix/bsd/netbsdlike/openbsdlike/bitrig/mod.rs
View File

@ -1,6 +1,21 @@
pub type c_char = i8;
s! {
pub struct glob_t {
pub gl_pathc: ::c_int,
pub gl_matchc: ::c_int,
pub gl_offs: ::c_int,
pub gl_flags: ::c_int,
pub gl_pathv: *mut *mut ::c_char,
__unused1: *mut ::c_void,
__unused2: *mut ::c_void,
__unused3: *mut ::c_void,
__unused4: *mut ::c_void,
__unused5: *mut ::c_void,
__unused6: *mut ::c_void,
__unused7: *mut ::c_void,
}
pub struct lconv {
pub decimal_point: *mut ::c_char,
pub thousands_sep: *mut ::c_char,

15
src/unix/bsd/netbsdlike/openbsdlike/mod.rs
View File

@ -34,21 +34,6 @@ s! {
pub sin_zero: [::int8_t; 8],
}
pub struct glob_t {
pub gl_pathc: ::c_int,
pub gl_matchc: ::c_int,
pub gl_offs: ::c_int,
pub gl_flags: ::c_int,
pub gl_pathv: *mut *mut ::c_char,
__unused1: *mut ::c_void,
__unused2: *mut ::c_void,
__unused3: *mut ::c_void,
__unused4: *mut ::c_void,
__unused5: *mut ::c_void,
__unused6: *mut ::c_void,
__unused7: *mut ::c_void,
}
pub struct kevent {
pub ident: ::uintptr_t,
pub filter: ::c_short,

15
src/unix/bsd/netbsdlike/openbsdlike/openbsd/mod.rs
View File

@ -1,4 +1,19 @@
s! {
pub struct glob_t {
pub gl_pathc: ::size_t,
pub gl_matchc: ::size_t,
pub gl_offs: ::size_t,
pub gl_flags: ::c_int,
pub gl_pathv: *mut *mut ::c_char,
__unused1: *mut ::c_void,
__unused2: *mut ::c_void,
__unused3: *mut ::c_void,
__unused4: *mut ::c_void,
__unused5: *mut ::c_void,
__unused6: *mut ::c_void,
__unused7: *mut ::c_void,
}
pub struct lconv {
pub decimal_point: *mut ::c_char,
pub thousands_sep: *mut ::c_char,