Merge with remote again

jbarnette · Apr 22, 2008 · b930f22 · b930f22
2 parents db2aeae + 4a0770d
commit b930f22
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 7 deletions.
diff --git a/ext/spidermonkey/context.c b/ext/spidermonkey/context.c
@@ -181,11 +181,11 @@ static VALUE initialize_native(VALUE self, VALUE options)
 }
 
 // Argv is [ object, name, value, READ_ONLY | ITERABLE | NON_DELETABLE ]
-static JSBool define_property(JSContext *context, JSObject *obj, uintN argc, jsval *argv, jsval *retval) {
+static JSBool define_property(JSContext *js_context, JSObject *obj, uintN argc, jsval *argv, jsval *retval) {
   char *name = JS_GetStringBytes(JSVAL_TO_STRING(argv[1]));
   int flags = JSVAL_TO_INT(argv[3]);
 
-  return JS_DefineProperty(context, JSVAL_TO_OBJECT(argv[0]), name, argv[2], NULL, NULL, flags);
+  return JS_DefineProperty(js_context, JSVAL_TO_OBJECT(argv[0]), name, argv[2], NULL, NULL, flags);
 }
 
 void init_Johnson_SpiderMonkey_Context(VALUE spidermonkey)

diff --git a/ext/spidermonkey/js_land_proxy.c b/ext/spidermonkey/js_land_proxy.c
@@ -15,7 +15,7 @@ static JSClass JSLandProxyClass = {
   get,
   set,
   JS_EnumerateStub,
-  (JSResolveOp)resolve,
+  (JSResolveOp) resolve,
   JS_ConvertStub,
   finalize
 };

diff --git a/ext/spidermonkey/js_land_proxy.h b/ext/spidermonkey/js_land_proxy.h
@@ -4,13 +4,10 @@
 #include "spidermonkey.h"
 #include "context.h"
 
-#define JS_FUNCTION_PROXY_PROPERTY "__isProxyForRubyProc"
-
 bool js_value_is_proxy(OurContext* context, jsval maybe_proxy);
 VALUE unwrap_js_land_proxy(OurContext* context, jsval proxy);
 JSBool make_js_land_proxy(OurContext* context, VALUE value, jsval* retval);
 
-// FIXME: WTF
 #include "node.h"
 typedef struct {
   VALUE klass, rklass;

diff --git a/ext/spidermonkey/spidermonkey.h b/ext/spidermonkey/spidermonkey.h
@@ -4,8 +4,8 @@
 #include <assert.h>
 #include <stdio.h>
 #include <stdbool.h>
-
 #include <ruby.h>
+
 #include "jsapi.h"
 #include "jshash.h"
 #include "jsregexp.h"