Merge MC -> JM

2011-11-14 09:13:33 -08:00
parent e0fc0ed568 faa4270540
commit ae4638c3cf
436 changed files with 8956 additions and 2344 deletions
--- a/js/src/gc/Statistics.cpp
+++ b/js/src/gc/Statistics.cpp
@@ -44,10 +44,14 @@
 #include "jscrashreport.h"
 #include "jsprf.h"
 #include "jsprobes.h"
+#include "jsscope.h"
 #include "jsutil.h"
 #include "prmjtime.h"

 #include "gc/Statistics.h"
+#include "vm/GlobalObject.h"
+
+#include "jsobjinlines.h"

 namespace js {
 namespace gcstats {