Merge from tracemonkey to jsdbg2.

2011-04-26 14:45:06 -05:00
parent 2e82ffa07a b8f37db93a
commit 37daf8c1f1
1663 changed files with 48457 additions and 38107 deletions
--- a/js/src/jsatom.cpp
+++ b/js/src/jsatom.cpp
@@ -52,6 +52,7 @@
 #include "jsbit.h"
 #include "jscntxt.h"
 #include "jsgc.h"
+#include "jsgcmark.h"
 #include "jslock.h"
 #include "jsnum.h"
 #include "jsparse.h"