diff --git a/mozilla/js2/src/macbuild/JS2.mcp b/mozilla/js2/src/macbuild/JS2.mcp
index c14226bd111..9353c08fb8b 100644
Binary files a/mozilla/js2/src/macbuild/JS2.mcp and b/mozilla/js2/src/macbuild/JS2.mcp differ
diff --git a/mozilla/js2/src/utilities.cpp b/mozilla/js2/src/utilities.cpp
index a279114b2f2..161dc1b3b0b 100644
--- a/mozilla/js2/src/utilities.cpp
+++ b/mozilla/js2/src/utilities.cpp
@@ -34,6 +34,10 @@
 #include "utilities.h"
 #ifdef DEBUG
 #    include <cstdio>
+#    ifdef XP_MAC
+#        include <cstdarg>
+#        include <Types.h>
+#    endif
 #    ifdef WIN32
 #        include <stdlib.h>
 #        include <windows.h>
@@ -97,6 +101,7 @@ namespace JavaScript
     void
     Assert(const char *s, const char *file, int line)
     {
+
 #if defined(XP_UNIX) || defined(XP_OS2)
         fprintf(std::stderr, "Assertion failure: %s, at %s:%d\n", s, file, line);
 #endif
diff --git a/mozilla/js2/tests/cpp/macbuild/js2_shell.mcp b/mozilla/js2/tests/cpp/macbuild/js2_shell.mcp
index 589c2401cc3..fc9b9472dbb 100755
Binary files a/mozilla/js2/tests/cpp/macbuild/js2_shell.mcp and b/mozilla/js2/tests/cpp/macbuild/js2_shell.mcp differ
diff --git a/mozilla/js2/tests/cpp/macbuild/parser_test.mcp b/mozilla/js2/tests/cpp/macbuild/parser_test.mcp
new file mode 100755
index 00000000000..f63f691fa97
Binary files /dev/null and b/mozilla/js2/tests/cpp/macbuild/parser_test.mcp differ