From fde55e296da0ef5248fd2cb13abc22faa494d741 Mon Sep 17 00:00:00 2001
From: Jason Orendorff <jorendorff@mozilla.com>
Date: Tue, 4 Jun 2013 16:24:43 -0500
Subject: [PATCH] Bug 872416, part 6 - Make jsobjinlines.h not include
 jsscriptinlines.h, eliminating the #include cycle jsscriptinlines.h ->
 vm/Shape-inl.h -> jsobjinlines.h -> jsscriptinlines.h. NOT REVIEWED YET.

---
 js/src/jsobj.cpp      | 2 +-
 js/src/jsobjinlines.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/js/src/jsobj.cpp b/js/src/jsobj.cpp
index 1adef5e8b54..1c484a3cdf4 100644
--- a/js/src/jsobj.cpp
+++ b/js/src/jsobj.cpp
@@ -7,7 +7,7 @@
 /*
  * JS object implementation.
  */
-#include "jsobj.h"
+#include "jsobjinlines.h"
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/js/src/jsobjinlines.h b/js/src/jsobjinlines.h
index 31955124c8d..3d04f4fe07e 100644
--- a/js/src/jsobjinlines.h
+++ b/js/src/jsobjinlines.h
@@ -7,6 +7,8 @@
 #ifndef jsobjinlines_h___
 #define jsobjinlines_h___
 
+#include "jsobj.h"
+
 #include "jsapi.h"
 #include "jsarray.h"
 #include "jsbool.h"
@@ -15,7 +17,6 @@
 #include "jsiter.h"
 #include "jslock.h"
 #include "jsnum.h"
-#include "jsobj.h"
 #include "jsprobes.h"
 #include "jspropertytree.h"
 #include "jsproxy.h"
@@ -40,7 +41,6 @@
 #include "jsfuninlines.h"
 #include "jsgcinlines.h"
 #include "jsinferinlines.h"
-#include "jsscriptinlines.h"
 
 #include "gc/Barrier-inl.h"