Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-13 01:15:34 +01:00
Code Issues Projects Releases Packages Wiki Activity

auto merge of #467 : ILyoan/servo/jsval2, r=metajack

Browse source 
This is a fix for #309 and #308 along with https://github.com/mozilla-servo/rust-mozjs/pull/18. 
Change JSVal from u64 to {u64}
This commit is contained in:
bors-servo 2013-05-22 11:18:25 -07:00
commit de2f913c34
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/servo/dom/bindings/codegen/CodegenRust.py
View file

@ -1454,7 +1454,7 @@ def getWrapTemplateForType(type, descriptorProvider, result, successCode,
""" """
if failureCode is None: if failureCode is None:
if not haveSuccessCode: if not haveSuccessCode:
return wrapCall + ";\n" + "return if *vp != 0 { 1 } else { 0 };" return wrapCall + ";\n" + "return if (*vp).v != 0 { 1 } else { 0 };"
failureCode = "return 0;" failureCode = "return 0;"
str = ("if !%s {\n" + str = ("if !%s {\n" +
CGIndenter(CGGeneric(failureCode)).define() + "\n" + CGIndenter(CGGeneric(failureCode)).define() + "\n" +

2
src/support/spidermonkey/rust-mozjs

@ -1 +1 @@
Subproject commit f68fa6237754b9317cea7765de15a54ee832271f Subproject commit dc25b92b3f8777b3599455cee190d1a07348b717