diff --git a/src/servo/dom/rcu.rs b/src/servo/dom/rcu.rs index b1d3f69e89a..867b9f58a88 100644 --- a/src/servo/dom/rcu.rs +++ b/src/servo/dom/rcu.rs @@ -57,6 +57,7 @@ themselves. ")]; import ptr::extensions; +import core::libc::types::os::arch::c95::size_t; export handle; export reader_methods; @@ -133,7 +134,7 @@ impl private_methods for scope { fn clone(v: *T) -> *T unsafe { let n: *mut T = unsafe::reinterpret_cast( - libc::calloc(sys::size_of::(), 1u)); + libc::calloc(sys::size_of::() as size_t, 1u as size_t)); // n.b.: this assignment will run the drop glue for . // *Hopefully* the fact that everything is initialized to NULL @@ -215,7 +216,7 @@ impl writer_methods for scope { fn handle(v: T) -> handle unsafe { let d: *handle_data = unsafe::reinterpret_cast( - libc::malloc(sys::size_of::>())); + libc::malloc(sys::size_of::>() as size_t)); (*d).rd_ptr = self.clone(ptr::addr_of(v)); (*d).wr_ptr = (*d).rd_ptr; (*d).rd_aux = ptr::null(); diff --git a/src/servo/gfx/renderer.rs b/src/servo/gfx/renderer.rs index e715bab0f59..758b92ac572 100644 --- a/src/servo/gfx/renderer.rs +++ b/src/servo/gfx/renderer.rs @@ -315,6 +315,7 @@ fn draw_some_text(draw_target: AzDrawTargetRef) { import cairoftbg = azure::cairo_ft::bindgen; import libc::types::common::c99::uint16_t; import libc::types::common::c99::uint32_t; + import azure::freetype::FT_Long; impl methods for ft::FT_Error { fn for_sure() { assert self == 0 as ft::FT_Error } @@ -328,7 +329,7 @@ fn draw_some_text(draw_target: AzDrawTargetRef) { let face: ft::FT_Face = ptr::null(); vec::as_buf(fontbin) {|buf| ftbg::FT_New_Memory_Face(library, buf, fontbin.len() as ft::FT_Long, - 0, ptr::addr_of(face)).for_sure(); + 0 as FT_Long, ptr::addr_of(face)).for_sure(); } unsafe {