Update various Cargo patches and deal with the fallout

This commit is contained in:
Lars Bergstrom 2015-05-22 16:16:50 -05:00
parent 25f87aa8ab
commit 442bfb716b
8 changed files with 25 additions and 36 deletions

View file

@ -277,11 +277,12 @@ impl WindowMethods for Window {
#[cfg(target_os="linux")]
fn native_metadata(&self) -> NativeGraphicsMetadata {
unsafe {
NativeGraphicsMetadata {
display: DISPLAY,
}
}
use x11::xlib;
unsafe {
NativeGraphicsMetadata {
display: DISPLAY as *mut xlib::Display,
}
}
}
fn create_compositor_channel(_: &Option<Rc<Window>>)