Skip to content

Commit 2c278d1

Browse files
committed
Auto merge of #1295 - semarie:openbsd-vm_size_t, r=gnzlbg
vm_size_t does not exist on OpenBSD and Bitrig unbreak openbsd and bitrig after #1294 r? @gnzlbg
2 parents b166b11 + 887ac11 commit 2c278d1

File tree

4 files changed

+3
-1
lines changed

4 files changed

+3
-1
lines changed

src/unix/bsd/apple/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ pub type posix_spawnattr_t = *mut ::c_void;
3131
pub type posix_spawn_file_actions_t = *mut ::c_void;
3232
pub type key_t = ::c_int;
3333
pub type shmatt_t = ::c_ushort;
34+
pub type vm_size_t = ::uintptr_t;
3435

3536
#[cfg_attr(feature = "extra_traits", derive(Debug))]
3637
pub enum timezone {}

src/unix/bsd/freebsdlike/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ pub type tcflag_t = ::c_uint;
1414
pub type speed_t = ::c_uint;
1515
pub type nl_item = ::c_int;
1616
pub type id_t = i64;
17+
pub type vm_size_t = ::uintptr_t;
1718

1819
#[cfg_attr(feature = "extra_traits", derive(Debug))]
1920
pub enum timezone {}

src/unix/bsd/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ pub type socklen_t = u32;
66
pub type sa_family_t = u8;
77
pub type pthread_t = ::uintptr_t;
88
pub type nfds_t = ::c_uint;
9-
pub type vm_size_t = ::uintptr_t;
109

1110
s! {
1211
pub struct sockaddr {

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ pub type fsfilcnt_t = ::uint64_t;
77
pub type idtype_t = ::c_int;
88
pub type mqd_t = ::c_int;
99
type __pthread_spin_t = __cpu_simple_lock_nv_t;
10+
pub type vm_size_t = ::uintptr_t;
1011

1112
s! {
1213
pub struct aiocb {

0 commit comments

Comments
 (0)