summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Lerche <me@carllerche.com>2014-12-22 11:15:57 -0800
committerCarl Lerche <me@carllerche.com>2014-12-22 11:15:57 -0800
commit898674f93c2a4df6a8e2c9e07ed509ddb3d4e866 (patch)
tree134ab3bdfb3a8665681cb38b91d379be07ba6ef3 /src
parent078fff6bc3a9a14ee11ec979397a193d4468ca90 (diff)
parentd470eab9322d6d797c99d97fe2880b139d32e44d (diff)
downloadnix-898674f93c2a4df6a8e2c9e07ed509ddb3d4e866.zip
Merge remote-tracking branch 'vhbit/ios-support'
Diffstat (limited to 'src')
-rw-r--r--src/sys/event.rs4
-rw-r--r--src/sys/mman.rs4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/sys/event.rs b/src/sys/event.rs
index a883c991..fbba2f3a 100644
--- a/src/sys/event.rs
+++ b/src/sys/event.rs
@@ -1,7 +1,7 @@
/* TOOD: Implement for other kqueue based systems
*/
-use libc::{timespec, time_t, c_int, c_long};
+use libc::{timespec, time_t, c_int, c_long, uintptr_t};
use errno::{SysResult, SysError};
use fcntl::Fd;
use std::fmt;
@@ -204,7 +204,7 @@ pub fn ev_set(ev: &mut KEvent,
fflags: FilterFlag,
udata: uint) {
- ev.ident = ident as u64;
+ ev.ident = ident as uintptr_t;
ev.filter = filter;
ev.flags = flags;
ev.fflags = fflags;
diff --git a/src/sys/mman.rs b/src/sys/mman.rs
index 6d287eb8..178df873 100644
--- a/src/sys/mman.rs
+++ b/src/sys/mman.rs
@@ -66,7 +66,8 @@ mod consts {
pub const MAP_FAILED: int = -1;
}
-#[cfg(target_os = "macos")]
+#[cfg(any(target_os = "macos",
+ target_os = "ios"))]
mod consts {
use libc::c_int;
@@ -192,4 +193,3 @@ pub fn shm_unlink(name: &String) -> SysResult<()> {
Ok(())
}
}
-