Merge cvs-trunk-mirror to mozilla-central

2007-09-20 13:33:44 -04:00
parent 2ae1a7973b c6c550a2bc
commit 974f4edd0b
376 changed files with 10005 additions and 22757 deletions
--- a/js/src/jsopcode.cpp
+++ b/js/src/jsopcode.cpp
@@ -516,7 +516,7 @@ const char js_EscapeMap[] = {
    '"',  '"',
    '\'', '\'',
    '\\', '\\',
-    0
+    '\0', '0'
 };

 #define DONT_ESCAPE     0x10000