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
rust-lang · Mar 3, 2019 · 2c278d1 · 2c278d1
2 parents b166b11 + 887ac11
commit 2c278d1
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 1 deletion.
diff --git a/src/unix/bsd/apple/mod.rs b/src/unix/bsd/apple/mod.rs
@@ -31,6 +31,7 @@ pub type posix_spawnattr_t = *mut ::c_void;
 pub type posix_spawn_file_actions_t = *mut ::c_void;
 pub type key_t = ::c_int;
 pub type shmatt_t = ::c_ushort;
+pub type vm_size_t = ::uintptr_t;
 
 #[cfg_attr(feature = "extra_traits", derive(Debug))]
 pub enum timezone {}

diff --git a/src/unix/bsd/freebsdlike/mod.rs b/src/unix/bsd/freebsdlike/mod.rs
@@ -14,6 +14,7 @@ pub type tcflag_t = ::c_uint;
 pub type speed_t = ::c_uint;
 pub type nl_item = ::c_int;
 pub type id_t = i64;
+pub type vm_size_t = ::uintptr_t;
 
 #[cfg_attr(feature = "extra_traits", derive(Debug))]
 pub enum timezone {}

diff --git a/src/unix/bsd/mod.rs b/src/unix/bsd/mod.rs
@@ -6,7 +6,6 @@ pub type socklen_t = u32;
 pub type sa_family_t = u8;
 pub type pthread_t = ::uintptr_t;
 pub type nfds_t = ::c_uint;
-pub type vm_size_t = ::uintptr_t;
 
 s! {
     pub struct sockaddr {

diff --git a/src/unix/bsd/netbsdlike/netbsd/mod.rs b/src/unix/bsd/netbsdlike/netbsd/mod.rs
@@ -7,6 +7,7 @@ pub type fsfilcnt_t = ::uint64_t;
 pub type idtype_t = ::c_int;
 pub type mqd_t = ::c_int;
 type __pthread_spin_t = __cpu_simple_lock_nv_t;
+pub type vm_size_t = ::uintptr_t;
 
 s! {
     pub struct aiocb {