Bug 1069655 - Fix build errors in non-unified builds r=me
authorJon Coppeard <jcoppeard@mozilla.com>
Mon, 22 Sep 2014 11:09:53 +0100
changeset 206497 d47f0d824c2d9cb98148f55c3eeb714c014fa5d5
parent 206496 3161ad541392fa48ff11ffea06dbbc2b17d8a02c
child 206498 6c05e3dc15ac8a4aec5b1b037af43702625565cd
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
reviewersme
bugs1069655
milestone35.0a1
Bug 1069655 - Fix build errors in non-unified builds r=me
js/src/gc/ForkJoinNursery-inl.h
js/src/gc/ForkJoinNursery.h
--- a/js/src/gc/ForkJoinNursery-inl.h
+++ b/js/src/gc/ForkJoinNursery-inl.h
@@ -7,16 +7,18 @@
 
 #ifndef gc_ForkJoinNursery_inl_h
 #define gc_ForkJoinNursery_inl_h
 
 #ifdef JSGC_FJGENERATIONAL
 
 #include "gc/ForkJoinNursery.h"
 
+#include "jsgc.h"
+
 namespace js {
 namespace gc {
 
 // For the following two predicates we can't check the attributes on
 // the chunk trailer because it's not known whether addr points into a
 // chunk.
 //
 // A couple of optimizations are possible if performance is an issue:
--- a/js/src/gc/ForkJoinNursery.h
+++ b/js/src/gc/ForkJoinNursery.h
@@ -31,16 +31,17 @@ class ForkJoinShared;
 }
 
 namespace js {
 namespace gc {
 
 class ForkJoinGCShared;
 class ForkJoinNursery;
 class ForkJoinNurseryCollectionTracer;
+class RelocationOverlay;
 
 // This tracer comes into play when a class has a tracer function, but
 // is otherwise unused and has no other functionality.
 //
 // It could look like this could be merged into ForkJoinNursery by
 // making the latter derive from JSTracer; I've decided to keep them
 // separate for now, since it allows for multiple instantiations of
 // this class with different parameters, for different purposes.  That