[gjs/wip/xulrunner-1.9.3-rebase5: 26/26] importer: Handle new JS_ENUMERATE_INIT_ALL

[Colin Walters <walters src gnome org>]

commit ea1d6781fb1b1be53e7f2031d7df6204944ffda0
Author: Colin Walters <walters verbum org>
Date:   Wed Sep 22 18:23:14 2010 -0400

    importer: Handle new JS_ENUMERATE_INIT_ALL
    
    We don't have any non-enumerable properties, so it should be fine to
    just do the same thing we do for JS_ENUMERATE_INIT.

 gjs/compat.h   |    3 +++
 gjs/importer.c |    3 +++
 2 files changed, 6 insertions(+), 0 deletions(-)
---
diff --git a/gjs/compat.h b/gjs/compat.h
index 226018c..7ee415b 100644
--- a/gjs/compat.h
+++ b/gjs/compat.h
@@ -1,6 +1,7 @@
 /* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
 /*
  * Copyright (c) 2009  litl, LLC
+ * Copyright (c) 2010  Red Hat, Inc.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -59,6 +60,8 @@ G_BEGIN_DECLS
 #define JSID_VOID JSVAL_VOID
 #define JSID_IS_VOID(id) (id == JSVAL_VOID)
 
+#else
+#define HAVE_JS_ENUMERATE_INIT_ALL
 #endif
 
 G_END_DECLS
diff --git a/gjs/importer.c b/gjs/importer.c
index f97246b..6428ab3 100644
--- a/gjs/importer.c
+++ b/gjs/importer.c
@@ -724,6 +724,9 @@ importer_new_enumerate(JSContext  *context,
     ImporterIterator *iter;
 
     switch (enum_op) {
+#ifdef HAVE_JS_ENUMERATE_INIT_ALL
+    case JSENUMERATE_INIT_ALL:
+#endif
     case JSENUMERATE_INIT: {
         Importer *priv;
         JSObject *search_path;