diff options
author | Anthony Ramine <n.oxyde@gmail.com> | 2016-02-11 17:04:57 +0100 |
---|---|---|
committer | Anthony Ramine <n.oxyde@gmail.com> | 2016-02-13 11:13:19 +0100 |
commit | 55dcee94be61b05ce85c4226a285e3f63b95fc1c (patch) | |
tree | 7457b0211605d621b29476922b2d4600e871ad84 /components/script/dom | |
parent | 26a82a6338d57ac9a384492fe68b4e1eb5674a65 (diff) | |
download | servo-55dcee94be61b05ce85c4226a285e3f63b95fc1c.tar.gz servo-55dcee94be61b05ce85c4226a285e3f63b95fc1c.zip |
Bump heapsize to 0.3
Diffstat (limited to 'components/script/dom')
-rw-r--r-- | components/script/dom/bindings/utils.rs | 3 | ||||
-rw-r--r-- | components/script/dom/node.rs | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/components/script/dom/bindings/utils.rs b/components/script/dom/bindings/utils.rs index 83e7a2e4cb2..ba887934798 100644 --- a/components/script/dom/bindings/utils.rs +++ b/components/script/dom/bindings/utils.rs @@ -36,6 +36,7 @@ use js::{JS_CALLEE}; use libc::{self, c_uint}; use std::default::Default; use std::ffi::CString; +use std::os::raw::c_void; use std::ptr; use util::non_geckolib::jsstring_to_str; @@ -91,7 +92,7 @@ pub struct DOMClass { pub type_id: TopTypeId, /// The HeapSizeOf function wrapper for that interface. - pub heap_size_of: unsafe fn(*const libc::c_void) -> usize, + pub heap_size_of: unsafe fn(*const c_void) -> usize, } unsafe impl Sync for DOMClass {} diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs index aef4192dc6e..5e02dc3d0e6 100644 --- a/components/script/dom/node.rs +++ b/components/script/dom/node.rs @@ -2446,7 +2446,7 @@ impl HeapSizeOf for UniqueId { #[allow(unsafe_code)] fn heap_size_of_children(&self) -> usize { if let &Some(ref uuid) = unsafe { &*self.cell.get() } { - heap_size_of(&** uuid as *const Uuid as *const c_void) + unsafe { heap_size_of(&** uuid as *const Uuid as *const _) } } else { 0 } |