user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

auto merge of #9562 : alexcrichton/rust/snapshots, r=thestinger

Browse source
This commit is contained in:
bors 2013-09-27 21:56:04 -07:00
commit c151d371fc
4 changed files with 8 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/libstd/rt/crate_map.rs
View file

@ -10,7 +10,6 @@
use libc::c_char;
#[cfg(stage0)] use libc::c_void;
use ptr;
use ptr::RawPtr;
use vec;
@ -40,17 +39,6 @@ struct CrateMapV0 {
children: [*CrateMap, ..1]
}
#[cfg(stage0)]
struct CrateMap {
version: i32,
annihilate_fn: *c_void,
entries: *ModEntry,
/// a dynamically sized struct, where all pointers to children are listed adjacent
/// to the struct, terminated with NULL
children: [*CrateMap, ..1]
}
#[cfg(not(stage0))]
struct CrateMap {
version: i32,
entries: *ModEntry,