aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authoraydin.kim <aydin.kim@samsung.com>2013-05-27 17:01:27 +0900
committeraydin.kim <aydin.kim@samsung.com>2013-08-22 15:26:11 +0900
commitda2ccb048e10a6699a9930225d4b9e74df04219f (patch)
tree209c9c5df4fcbc6a31388094f7099d666894107b /src
parent730c10e6aaf6db7d4b21ceae14f6f218f024c900 (diff)
downloadservo-da2ccb048e10a6699a9930225d4b9e74df04219f.tar.gz
servo-da2ccb048e10a6699a9930225d4b9e74df04219f.zip
fix dom bindings for android(and 32bit system) build
Diffstat (limited to 'src')
-rw-r--r--src/components/script/dom/bindings/codegen/CodegenRust.py2
-rw-r--r--src/components/script/dom/bindings/proxyhandler.rs4
-rw-r--r--src/components/script/dom/bindings/utils.rs4
3 files changed, 5 insertions, 5 deletions
diff --git a/src/components/script/dom/bindings/codegen/CodegenRust.py b/src/components/script/dom/bindings/codegen/CodegenRust.py
index 5d12b15fdc7..be1d1e9a228 100644
--- a/src/components/script/dom/bindings/codegen/CodegenRust.py
+++ b/src/components/script/dom/bindings/codegen/CodegenRust.py
@@ -1563,7 +1563,7 @@ for (uint32_t i = 0; i < length; ++i) {
raise TypeError("We don't support nullable enumerated return types "
"yet")
return ("""assert!((%(result)s as uint) < %(strings)s.len());
-let %(resultStr)s: *JSString = JS_NewStringCopyN(cx, ptr::to_unsafe_ptr(&%(strings)s[%(result)s as u32].value[0]) as *i8, %(strings)s[%(result)s as u32].length as u64);
+let %(resultStr)s: *JSString = JS_NewStringCopyN(cx, ptr::to_unsafe_ptr(&%(strings)s[%(result)s as u32].value[0]) as *i8, %(strings)s[%(result)s as u32].length as libc::size_t);
if %(resultStr)s.is_null() {
return 0;
}
diff --git a/src/components/script/dom/bindings/proxyhandler.rs b/src/components/script/dom/bindings/proxyhandler.rs
index 2aac4a14918..3128c27d727 100644
--- a/src/components/script/dom/bindings/proxyhandler.rs
+++ b/src/components/script/dom/bindings/proxyhandler.rs
@@ -70,7 +70,7 @@ pub fn _obj_toString(cx: *JSContext, className: *libc::c_char) -> *JSString {
unsafe {
let name = str::raw::from_c_str(className);
let nchars = "[object ]".len() + name.len();
- let chars: *mut jschar = cast::transmute(JS_malloc(cx, (nchars + 1) as u64 * (size_of::<jschar>() as u64)));
+ let chars: *mut jschar = cast::transmute(JS_malloc(cx, (nchars + 1) as libc::size_t * (size_of::<jschar>() as libc::size_t)));
if chars.is_null() {
return ptr::null();
}
@@ -80,7 +80,7 @@ pub fn _obj_toString(cx: *JSContext, className: *libc::c_char) -> *JSString {
*chars.offset(i as int) = c as jschar;
}
*chars.offset(nchars as int) = 0;
- let jsstr = JS_NewUCString(cx, cast::transmute(chars), nchars as u64);
+ let jsstr = JS_NewUCString(cx, cast::transmute(chars), nchars as libc::size_t);
if jsstr.is_null() {
JS_free(cx, cast::transmute(chars));
}
diff --git a/src/components/script/dom/bindings/utils.rs b/src/components/script/dom/bindings/utils.rs
index e20fdeba893..6382dfa8ca2 100644
--- a/src/components/script/dom/bindings/utils.rs
+++ b/src/components/script/dom/bindings/utils.rs
@@ -37,8 +37,8 @@ use js::{JSPROP_SETTER, JSVAL_VOID, JSVAL_TRUE, JSVAL_FALSE};
use js::{JS_THIS_OBJECT, JSFUN_CONSTRUCTOR, JS_CALLEE, JSPROP_READONLY};
use js;
-static TOSTRING_CLASS_RESERVED_SLOT: u64 = 0;
-static TOSTRING_NAME_RESERVED_SLOT: u64 = 1;
+static TOSTRING_CLASS_RESERVED_SLOT: libc::size_t = 0;
+static TOSTRING_NAME_RESERVED_SLOT: libc::size_t = 1;
struct GlobalStaticData {
proxy_handlers: HashMap<uint, *libc::c_void>,