diff options
| author | bors-servo <release+servo@mozilla.com> | 2014-03-19 12:35:17 -0400 |
|---|---|---|
| committer | bors-servo <release+servo@mozilla.com> | 2014-03-19 12:35:17 -0400 |
| commit | f7aa6e3d9b8bfcc0565624f1094241b3b8658bd8 (patch) | |
| tree | 7e7fbd7976c3da12ff463d6ffbeb1a3a336ae7d3 /src/components/script/dom/bindings/proxyhandler.rs | |
| parent | caf1ed94468da3c134cc8e8f4a1b934bb353dc19 (diff) | |
| parent | a6100563a6e43471ae43fb155113bc2026992f78 (diff) | |
| download | servo-f7aa6e3d9b8bfcc0565624f1094241b3b8658bd8.tar.gz servo-f7aa6e3d9b8bfcc0565624f1094241b3b8658bd8.zip | |
auto merge of #1934 : larsbergstrom/servo/rust_20140224_squashed, r=jdm
For review only - don't approve yet (need to squash and land submodule updates first).
critic? @metajack
Diffstat (limited to 'src/components/script/dom/bindings/proxyhandler.rs')
| -rw-r--r-- | src/components/script/dom/bindings/proxyhandler.rs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/components/script/dom/bindings/proxyhandler.rs b/src/components/script/dom/bindings/proxyhandler.rs index aaf75a7bc7a..81c36d639ad 100644 --- a/src/components/script/dom/bindings/proxyhandler.rs +++ b/src/components/script/dom/bindings/proxyhandler.rs @@ -19,12 +19,10 @@ use std::ptr; use std::str; use std::mem::size_of; -type c_bool = libc::c_int; - static JSPROXYSLOT_EXPANDO: u32 = 0; pub extern fn getPropertyDescriptor(cx: *JSContext, proxy: *JSObject, id: jsid, - set: c_bool, desc: *mut JSPropertyDescriptor) -> c_bool { + set: libc::c_int, desc: *mut JSPropertyDescriptor) -> libc::c_int { unsafe { let handler = GetProxyHandler(proxy); if InvokeGetOwnPropertyDescriptor(handler, cx, proxy, id, set, desc) == 0 { |