diff options
| author | Colin Walters <walters@verbum.org> | 2010-09-17 08:32:50 -0400 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2010-09-23 14:27:53 -0400 |
| commit | 07a8b7844516eafcdecc15fa94573cee374ce8a7 (patch) | |
| tree | db0fa4fb50346cc287ff618cc4131bc56880e2a9 | |
| parent | df6364531505896967b8907010822ed1e2aee62b (diff) | |
| download | gjs-07a8b7844516eafcdecc15fa94573cee374ce8a7.tar.gz | |
xulrunner 1.9.3: Fix up assumption JSVAL_NULL == NULL
Use C NULL where it's expected, not JSVAL_NULL.
https://bugzilla.gnome.org/show_bug.cgi?id=622896
| -rw-r--r-- | gi/arg.c | 6 | ||||
| -rw-r--r-- | modules/dbus-values.c | 4 |
2 files changed, 5 insertions, 5 deletions
@@ -363,7 +363,7 @@ gjs_array_from_strv(JSContext *context, guint i; JSBool result = JS_FALSE; - obj = JS_NewArrayObject(context, 0, JSVAL_NULL); + obj = JS_NewArrayObject(context, 0, NULL); if (obj == NULL) return JS_FALSE; @@ -1373,7 +1373,7 @@ gjs_array_from_g_list (JSContext *context, GArgument arg; JSBool result; - obj = JS_NewArrayObject(context, 0, JSVAL_NULL); + obj = JS_NewArrayObject(context, 0, NULL); if (obj == NULL) return JS_FALSE; @@ -1441,7 +1441,7 @@ gjs_array_from_g_array (JSContext *context, element_type = g_type_info_get_tag(param_info); element_type = replace_gtype(element_type); - obj = JS_NewArrayObject(context, 0, JSVAL_NULL); + obj = JS_NewArrayObject(context, 0, NULL); if (obj == NULL) return JS_FALSE; diff --git a/modules/dbus-values.c b/modules/dbus-values.c index ec8145a5..2a970462 100644 --- a/modules/dbus-values.c +++ b/modules/dbus-values.c @@ -51,7 +51,7 @@ gjs_js_one_value_from_dbus(JSContext *context, DBusMessageIter struct_iter; int index; - obj = JS_NewArrayObject(context, 0, JSVAL_NULL); + obj = JS_NewArrayObject(context, 0, NULL); if (obj == NULL) return JS_FALSE; @@ -171,7 +171,7 @@ gjs_js_one_value_from_dbus(JSContext *context, DBusMessageIter array_iter; int index; - obj = JS_NewArrayObject(context, 0, JSVAL_NULL); + obj = JS_NewArrayObject(context, 0, NULL); if (obj == NULL) return JS_FALSE; |