squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

rollup merge of #19729: vhbit/ios-oibit-fix

Browse source
This commit is contained in:
Alex Crichton 2014-12-17 08:33:46 -08:00
commit c43a807d25
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/librustrt/lib.rs
View file

@ -128,5 +128,5 @@ pub mod shouldnt_be_public {
#[cfg(not(test))]
mod std {
pub use core::{fmt, option, cmp};
pub use core::{fmt, option, cmp, kinds};
}

1
src/librustrt/libunwind.rs
View file

@ -25,6 +25,7 @@ use libc;
#[cfg(any(not(target_arch = "arm"), target_os = "ios"))]
#[repr(C)]
#[deriving(Copy)]
pub enum _Unwind_Action {
_UA_SEARCH_PHASE = 1,
_UA_CLEANUP_PHASE = 2,