JavaScriptCore-554.1.tar.gz

[apple/javascriptcore.git] / runtime / CallData.h

diff --git a/runtime/CallData.h b/runtime/CallData.h
index b8d84cd5f6ab8f9b318a213e7cbb5b2f52748166..d5b0172d8fdf804c44e30ab48e204cd5911628e7 100644 (file)
--- a/runtime/CallData.h
+++ b/runtime/CallData.h
@@ -29,13 +29,15 @@
 #ifndef CallData_h
 #define CallData_h
 
 #ifndef CallData_h
 #define CallData_h
 

+#include "NativeFunctionWrapper.h"
+

 namespace JSC {
 
     class ArgList;
     class ExecState;
     class FunctionBodyNode;
     class JSObject;
 namespace JSC {
 
     class ArgList;
     class ExecState;
     class FunctionBodyNode;
     class JSObject;

-    class JSValuePtr;
+    class JSValue;

     class ScopeChainNode;
 
     enum CallType {
     class ScopeChainNode;
 
     enum CallType {


@@ -44,7 +46,7 @@ namespace JSC {
         CallTypeJS
     };
 
         CallTypeJS
     };
 

-    typedef JSValuePtr (*NativeFunction)(ExecState*, JSObject*, JSValuePtr thisValue, const ArgList&);
+    typedef JSValue (JSC_HOST_CALL *NativeFunction)(ExecState*, JSObject*, JSValue thisValue, const ArgList&);

 
     union CallData {
         struct {
 
     union CallData {
         struct {


@@ -56,7 +58,7 @@ namespace JSC {
         } js;
     };
 
         } js;
     };
 

-    JSValuePtr call(ExecState*, JSValuePtr functionObject, CallType, const CallData&, JSValuePtr thisValue, const ArgList&);
+    JSValue call(ExecState*, JSValue functionObject, CallType, const CallData&, JSValue thisValue, const ArgList&);

 
 } // namespace JSC
 
 
 } // namespace JSC