Back out everything since 5435ee09cf7b. Tinderbox compilers hate me. r=epic-fail

2011-10-12 12:21:53 -07:00
parent 5de74dc5b1
commit c5e5f873d1
311 changed files with 1334 additions and 2251 deletions
--- a/dom/plugins/base/nsNPAPIPlugin.cpp
+++ b/dom/plugins/base/nsNPAPIPlugin.cpp
@@ -40,8 +40,6 @@
 #include <QX11Info>
 #endif

-#include "mozilla/Util.h"
-
 #include "base/basictypes.h"

 #include "prtypes.h"
@@ -1624,7 +1622,7 @@ _evaluate(NPP npp, NPObject* npobj, NPString *script, NPVariant *result)

  // Root obj and the rval (below).
  jsval vec[] = { OBJECT_TO_JSVAL(obj), JSVAL_NULL };
-  js::AutoArrayRooter tvr(cx, ArrayLength(vec), vec);
+  js::AutoArrayRooter tvr(cx, NS_ARRAY_LENGTH(vec), vec);
  jsval *rval = &vec[1];

  if (result) {