From: Alan Knowles <alan@roojs.com>
Date: Wed, 18 Mar 2015 12:16:53 +0000 (+0800)
Subject: sync
X-Git-Url: http://git.roojs.org/?p=app.Builder.js;a=commitdiff_plain;h=fc21b7d6e10764915823d17fdefb96a8b1c398ca;hp=-c

sync
---

fc21b7d6e10764915823d17fdefb96a8b1c398ca
diff --combined src/vapi/javascriptcore.vapi
index aacca04d2,9b57c0333..3cfb399ed
--- a/src/vapi/javascriptcore.vapi
+++ b/src/vapi/javascriptcore.vapi
@@@ -277,7 -277,7 +277,8 @@@ namespace JSCore 
  
    [Compact]
    /* FIXME: free_function causes a warning */
 +  [CCode (cname = "void", free_function = "(void)0")]
+   [CCode (cname = "JSValueRef", free_function = "")]
    public class Value {
      [CCode (cname = "JSValueMakeUndefined")]
      public Value.undefined (Context ctx);
@@@ -338,19 -338,21 +339,21 @@@
      public JSCore.String to_string_copy (Context ctx, Value *exception);
  
      [CCode (cname = "JSValueToObject", instance_pos=1.1)]
-     public Object to_object (Context ctx, Value *exception);
+     public Object to_object (Context ctx, out Value *exception);
  
      [CCode (cname = "JSValueProtect", instance_pos=1.1)]
      public void protect (Context ctx);
  
      [CCode (cname = "JSValueUnprotect", instance_pos=1.1)]
      public void unprotect (Context ctx);
+     
+    
    }
  
  
    [Compact]
    /* FIXME: causes a warning */
-   [CCode (cname = "void", free_function = "")]
+   [CCode (cname = "JSObjectRef", free_function = "")]
    public class Object: JSCore.Value {
      [CCode (cname = "JSObjectMake")]
      public Object (Context ctx, Class js_class, void *data);
@@@ -430,11 -432,12 +433,12 @@@
      public bool is_function (Context ctx);
  
      [CCode (cname = "JSObjectCallAsFunction", instance_pos=1.1)]
-     public unowned JSCore.Value call_as_function (Context ctx,
-                                                   JSCore.Object? this_object,
-                                                       [CCode (array_length_pos=2.9, array_length_type="size_t")]
-                                                   JSCore.Value[]? arguments,
-                                                   out JSCore.Value exception);
+     public unowned JSCore.Value call_as_function (Context ctx, 
+ 								   JSCore.Object thisObject,
+ 								   [CCode (array_length_pos=2.9, array_length_type="size_t")]
+ 								   JSCore.Value[] arguments,
+ 								   out JSCore.Value exception);
+ 
  
      [CCode (cname = "JSObjectIsConstructor", instance_pos=1.1)]
      public bool is_constructor (Context ctx);