Skip to content

Commit

Permalink
auto merge of #6684 : crabtw/rust/arm, r=ILyoan
Browse files Browse the repository at this point in the history
It seems to fix #6231.
  • Loading branch information
bors committed May 24, 2013
2 parents a776d65 + abb2823 commit 7c0cc9c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/libstd/cleanup.rs
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@ struct AllocHeader { priv opaque: () }
struct MemoryRegion { priv opaque: () }

#[cfg(target_arch="x86")]
#[cfg(target_arch="arm")]
struct Registers {
data: [u32, ..16]
}

#[cfg(target_arch="arm")]
#[cfg(target_arch="mips")]
struct Registers {
data: [u32, ..32]
Expand Down

0 comments on commit 7c0cc9c

Please sign in to comment.