diff options
| author | Ben Murdoch <benm@google.com> | 2010-06-15 19:36:43 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-06-16 14:52:28 +0100 |
| commit | 545e470e52f0ac6a3a072bf559c796b42c6066b6 (patch) | |
| tree | c0c14763654d84d37577dde512c3d3b4699a9e86 /JavaScriptCore/runtime/JSFunction.h | |
| parent | 719298a66237d38ea5c05f1547123ad8aacbc237 (diff) | |
| download | external_webkit-545e470e52f0ac6a3a072bf559c796b42c6066b6.zip external_webkit-545e470e52f0ac6a3a072bf559c796b42c6066b6.tar.gz external_webkit-545e470e52f0ac6a3a072bf559c796b42c6066b6.tar.bz2 | |
Merge webkit.org at r61121: Initial merge by git.
Change-Id: Icd6db395c62285be384d137164d95d7466c98760
Diffstat (limited to 'JavaScriptCore/runtime/JSFunction.h')
| -rw-r--r-- | JavaScriptCore/runtime/JSFunction.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/JavaScriptCore/runtime/JSFunction.h b/JavaScriptCore/runtime/JSFunction.h index a906b2e..3a2fe30 100644 --- a/JavaScriptCore/runtime/JSFunction.h +++ b/JavaScriptCore/runtime/JSFunction.h @@ -35,7 +35,7 @@ namespace JSC { class JSGlobalObject; class NativeExecutable; - JSValue JSC_HOST_CALL callHostFunctionAsConstructor(ExecState*); + EncodedJSValue JSC_HOST_CALL callHostFunctionAsConstructor(ExecState*); class JSFunction : public JSObjectWithGlobalObject { friend class JIT; |