diff options
| author | Colin Walters <walters@verbum.org> | 2010-09-17 08:32:50 -0400 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2010-09-20 16:04:25 -0400 |
| commit | 3d5bbcc167d79b52a4a665ce2852d1c968f20acc (patch) | |
| tree | 15f1ba588bd329f76dd2d69bfbe98c49ca465518 | |
| parent | 3ae54871016442bf10f1bcefe077d25c8ebc9b35 (diff) | |
| download | gjs-3d5bbcc167d79b52a4a665ce2852d1c968f20acc.tar.gz | |
xulrunner 1.9.3: Fix up assumption JSVAL_NULL == NULL
Use C NULL where it's expected, not JSVAL_NULL.
| -rw-r--r-- | gi/arg.c | 6 | ||||
| -rw-r--r-- | modules/dbus-values.c | 4 |
2 files changed, 5 insertions, 5 deletions
@@ -364,7 +364,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; @@ -1374,7 +1374,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; @@ -1442,7 +1442,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 7a0ea476..31f6424c 100644 --- a/modules/dbus-values.c +++ b/modules/dbus-values.c @@ -52,7 +52,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; @@ -172,7 +172,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; |