[gjs] xulrunner 1.9.3: Fix up assumption JSVAL_NULL == NULL
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gjs] xulrunner 1.9.3: Fix up assumption JSVAL_NULL == NULL
- Date: Thu, 23 Sep 2010 18:37:33 +0000 (UTC)
commit 07a8b7844516eafcdecc15fa94573cee374ce8a7
Author: Colin Walters <walters verbum org>
Date: Fri Sep 17 08:32:50 2010 -0400
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
gi/arg.c | 6 +++---
modules/dbus-values.c | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/gi/arg.c b/gi/arg.c
index c17a2b9..e9ec4e4 100644
--- a/gi/arg.c
+++ b/gi/arg.c
@@ -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 ec8145a..2a97046 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;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]