auto merge of #11472 : kud1ing/rust/iOS, r=alexcrichton

bors · bors · commit 29e82c65b471 · 2014-01-11T08:46:20.000-08:00
This fixes #11336 I guess the type sizes are correct for both OS X and iOS, but i am not certain. In any case, i'd rather have any iOS build at all, so that we have something to improve upon.
diff --git a/src/libstd/libc.rs b/src/libstd/libc.rs
@@ -1160,6 +1160,7 @@ pub mod types {
             }
         }
 
+        #[cfg(target_arch = "arm")]
         #[cfg(target_arch = "x86")]
         pub mod arch {
             pub mod c95 {

Original file line number	Diff line number	Diff line change
`@@ -1160,6 +1160,7 @@ pub mod types {`
`1160`	`1160`	`}`
`1161`	`1161`	`}`
`1162`	`1162`
	`1163`	`+ #[cfg(target_arch = "arm")]`
`1163`	`1164`	`#[cfg(target_arch = "x86")]`
`1164`	`1165`	`pub mod arch {`
`1165`	`1166`	`pub mod c95 {`