diff options
author | Alex Crichton <alex@alexcrichton.com> | 2018-07-31 14:13:30 -0700 |
---|---|---|
committer | Alex Crichton <alex@alexcrichton.com> | 2018-08-01 07:49:22 -0700 |
commit | 83f78df8c6f1e7309ed9bcb4bf1168b0bc7d2295 (patch) | |
tree | b97166858aee03c1ce04f20340cf3083d0f73b4b /src | |
parent | e1ebfafc2f011216287c61ce8ff492f57dddee36 (diff) | |
download | rust-libc-83f78df8c6f1e7309ed9bcb4bf1168b0bc7d2295.tar.gz |
Fix OSX builders on CI
Looks like Travis has moved on from our old images, so we're forced to
update.
Diffstat (limited to 'src')
-rw-r--r-- | src/unix/bsd/apple/mod.rs | 12 | ||||
-rw-r--r-- | src/unix/mod.rs | 1 |
2 files changed, 3 insertions, 10 deletions
diff --git a/src/unix/bsd/apple/mod.rs b/src/unix/bsd/apple/mod.rs index 4849d7f0f5..cf48528b4a 100644 --- a/src/unix/bsd/apple/mod.rs +++ b/src/unix/bsd/apple/mod.rs @@ -765,16 +765,8 @@ pub const VM_FLAGS_SUPERPAGE_MASK: ::c_int = 0x70000; pub const VM_FLAGS_RETURN_DATA_ADDR: ::c_int = 0x100000; pub const VM_FLAGS_RETURN_4K_DATA_ADDR: ::c_int = 0x800000; pub const VM_FLAGS_ALIAS_MASK: ::c_int = 0xFF000000; -pub const VM_FLAGS_USER_ALLOCATE: ::c_int = VM_FLAGS_FIXED | VM_FLAGS_ANYWHERE | - VM_FLAGS_PURGABLE | - VM_FLAGS_RANDOM_ADDR | - VM_FLAGS_NO_CACHE | - VM_FLAGS_OVERWRITE | - VM_FLAGS_SUPERPAGE_MASK | - VM_FLAGS_ALIAS_MASK; -pub const VM_FLAGS_USER_MAP: ::c_int = VM_FLAGS_USER_ALLOCATE | - VM_FLAGS_RETURN_4K_DATA_ADDR | - VM_FLAGS_RETURN_DATA_ADDR; +pub const VM_FLAGS_USER_ALLOCATE: ::c_int = 0xff07401b; +pub const VM_FLAGS_USER_MAP: ::c_int = 0xff97401b; pub const VM_FLAGS_USER_REMAP: ::c_int = VM_FLAGS_FIXED | VM_FLAGS_ANYWHERE | VM_FLAGS_RANDOM_ADDR | VM_FLAGS_OVERWRITE | diff --git a/src/unix/mod.rs b/src/unix/mod.rs index d0e054cc27..d180dd51eb 100644 --- a/src/unix/mod.rs +++ b/src/unix/mod.rs @@ -931,6 +931,7 @@ extern { pub fn openlog(ident: *const ::c_char, logopt: ::c_int, facility: ::c_int); pub fn closelog(); pub fn setlogmask(maskpri: ::c_int) -> ::c_int; + #[cfg_attr(target_os = "macos", link_name = "syslog$DARWIN_EXTSN")] pub fn syslog(priority: ::c_int, message: *const ::c_char, ...); #[cfg_attr(all(target_os = "macos", target_arch = "x86"), link_name = "nice$UNIX2003")] |