[gjs/wip/xulrunner-1.9.3-rebase2: 5/8] xulrunner 1.9.3: Fix up assumption JSVAL_NULL == NULL

[Colin Walters <walters src gnome org>]

commit 2e4f137e4e73739b468cf1ca6d93f4059c9314d0
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.

 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 419f7c3..9035731 100644
--- a/gi/arg.c
+++ b/gi/arg.c
@@ -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 7a0ea47..31f6424 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;