From 1730e6bf24fdacb958061b8ee80d5289f7a7b496 Mon Sep 17 00:00:00 2001
From: Ms2ger <ms2ger@gmail.com>
Date: Tue, 4 Mar 2014 10:41:30 +0100
Subject: [PATCH] Return a JSVal rather than a *JSVal from JS_CALLEE, to match
 C++.

---
 glue.rs    | 2 +-
 js.rc      | 4 ++--
 jsglue.cpp | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/glue.rs b/glue.rs
index 6c981bf9a..9aedd4c12 100644
--- a/glue.rs
+++ b/glue.rs
@@ -136,7 +136,7 @@ pub fn CallJitPropertyOp(info: *JSJitInfo, cx: *JSContext, thisObj: *JSObject, s
 pub fn CallJitMethodOp(info: *JSJitInfo, cx: *JSContext, thisObj: *JSObject, specializedThis: *libc::c_void, argc: libc::c_uint, vp: *JSVal) -> JSBool;
 
 //#[rust_stack]
-pub fn RUST_FUNCTION_VALUE_TO_JITINFO(v: *JSVal) -> *JSJitInfo;
+pub fn RUST_FUNCTION_VALUE_TO_JITINFO(v: JSVal) -> *JSJitInfo;
 
 pub fn SetFunctionNativeReserved(fun: *JSObject, which: libc::size_t, val: *JSVal);
 pub fn GetFunctionNativeReserved(fun: *JSObject, which: libc::size_t) -> *JSVal;
diff --git a/js.rc b/js.rc
index 3d1c1b898..6646e3583 100644
--- a/js.rc
+++ b/js.rc
@@ -170,8 +170,8 @@ pub unsafe fn JS_THIS_OBJECT(cx: *JSContext, vp: *mut JSVal) -> *JSObject {
 }
 
 #[inline(always)]
-pub unsafe fn JS_CALLEE(_cx: *JSContext, vp: *JSVal) -> *JSVal {
-    vp
+pub unsafe fn JS_CALLEE(_cx: *JSContext, vp: *JSVal) -> JSVal {
+    *vp
 }
 
 // This is a duplication of the shadow stuff from jsfriendapi.h.  Here
diff --git a/jsglue.cpp b/jsglue.cpp
index b27624a16..a2091c822 100644
--- a/jsglue.cpp
+++ b/jsglue.cpp
@@ -449,9 +449,9 @@ RUST_JS_NumberValue(double d)
 }
 
 const JSJitInfo*
-RUST_FUNCTION_VALUE_TO_JITINFO(jsval* v)
+RUST_FUNCTION_VALUE_TO_JITINFO(jsval v)
 {
-    return FUNCTION_VALUE_TO_JITINFO(*v);
+    return FUNCTION_VALUE_TO_JITINFO(v);
 }
 
 JSBool