auto merge of #2598 : Ms2ger/servo/unsafe-deriving, r=jdm

This commit is contained in:
bors-servo 2014-06-06 13:31:31 -04:00
commit c54baa663e

View file

@ -48,6 +48,7 @@ use js::JSPROP_PERMANENT;
use js::{JSFUN_CONSTRUCTOR, JSPROP_READONLY};
use js;
#[allow(raw_pointer_deriving)]
#[deriving(Encodable)]
pub struct GlobalStaticData {
pub proxy_handlers: Untraceable<HashMap<uint, *libc::c_void>>,