From 2ae960ccbdf74c508cd5bcd3d67073777fb45894 Mon Sep 17 00:00:00 2001
From: "mccabe%netscape.com"
 <mccabe%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 29 Aug 1998 01:53:39 +0000
Subject: [PATCH] More loose ends towards merging the development branch.

git-svn-id: svn://10.0.0.236/trunk@8779 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/js/ref/js.mak             | 235 +++++++++++++++++++++++++-----
 mozilla/js/ref/js.mdp             | Bin 17766 -> 17410 bytes
 mozilla/js/ref/macbuild/JSRef.mcp | Bin 34972 -> 34972 bytes
 3 files changed, 198 insertions(+), 37 deletions(-)

diff --git a/mozilla/js/ref/js.mak b/mozilla/js/ref/js.mak
index 0d73e7c2f2e..89b13367e4e 100644
--- a/mozilla/js/ref/js.mak
+++ b/mozilla/js/ref/js.mak
@@ -219,6 +219,7 @@ CLEAN :
 	-@erase "$(INTDIR)\jsdate.obj"
 	-@erase "$(INTDIR)\jsdbgapi.obj"
 	-@erase "$(INTDIR)\jsemit.obj"
+	-@erase "$(INTDIR)\jsexn.obj"
 	-@erase "$(INTDIR)\jsfun.obj"
 	-@erase "$(INTDIR)\jsgc.obj"
 	-@erase "$(INTDIR)\jsinterp.obj"
@@ -306,6 +307,7 @@ LINK32_OBJS= \
 	"$(INTDIR)\jsdate.obj" \
 	"$(INTDIR)\jsdbgapi.obj" \
 	"$(INTDIR)\jsemit.obj" \
+	"$(INTDIR)\jsexn.obj" \
 	"$(INTDIR)\jsfun.obj" \
 	"$(INTDIR)\jsgc.obj" \
 	"$(INTDIR)\jsinterp.obj" \
@@ -361,6 +363,7 @@ CLEAN :
 	-@erase "$(INTDIR)\jsdate.obj"
 	-@erase "$(INTDIR)\jsdbgapi.obj"
 	-@erase "$(INTDIR)\jsemit.obj"
+	-@erase "$(INTDIR)\jsexn.obj"
 	-@erase "$(INTDIR)\jsfun.obj"
 	-@erase "$(INTDIR)\jsgc.obj"
 	-@erase "$(INTDIR)\jsinterp.obj"
@@ -452,6 +455,7 @@ LINK32_OBJS= \
 	"$(INTDIR)\jsdate.obj" \
 	"$(INTDIR)\jsdbgapi.obj" \
 	"$(INTDIR)\jsemit.obj" \
+	"$(INTDIR)\jsexn.obj" \
 	"$(INTDIR)\jsfun.obj" \
 	"$(INTDIR)\jsgc.obj" \
 	"$(INTDIR)\jsinterp.obj" \
@@ -509,6 +513,7 @@ DEP_CPP_JS_C0=\
 	".\jsgc.h"\
 	".\jsinterp.h"\
 	".\jslock.h"\
+	".\jsmsg.def"\
 	".\jsobj.h"\
 	".\jsopcode.def"\
 	".\jsopcode.h"\
@@ -519,6 +524,7 @@ DEP_CPP_JS_C0=\
 	".\jsscan.h"\
 	".\jsscope.h"\
 	".\jsscript.h"\
+	".\jsstddef.h"\
 	".\jsstr.h"\
 	".\os\aix.h"\
 	".\os\bsdi.h"\
@@ -549,9 +555,11 @@ DEP_CPP_JS_C0=\
 	{$(INCLUDE)}"\sys\TYPES.H"\
 	
 NODEP_CPP_JS_C0=\
+	".\jsdb.h"\
 	".\jsdebug.h"\
 	".\jsdjava.h"\
-	".\pratomic.h"\
+	".\jsjava.h"\
+	".\jsperl.h"\
 	".\prcvar.h"\
 	".\prlock.h"\
 	
@@ -641,14 +649,14 @@ DEP_CPP_JSARR=\
 	".\jsgc.h"\
 	".\jsinterp.h"\
 	".\jslock.h"\
+	".\jsmsg.def"\
 	".\jsnum.h"\
 	".\jsobj.h"\
-	".\jsopcode.def"\
-	".\jsopcode.h"\
 	".\jsprvtd.h"\
 	".\jspubtd.h"\
 	".\jsregexp.h"\
 	".\jsscope.h"\
+	".\jsstddef.h"\
 	".\jsstr.h"\
 	".\os\aix.h"\
 	".\os\bsdi.h"\
@@ -679,7 +687,6 @@ DEP_CPP_JSARR=\
 	{$(INCLUDE)}"\sys\TYPES.H"\
 	
 NODEP_CPP_JSARR=\
-	".\pratomic.h"\
 	".\prcvar.h"\
 	".\prlock.h"\
 	
@@ -699,6 +706,7 @@ DEP_CPP_JSATO=\
 	".\jsgc.h"\
 	".\jsinterp.h"\
 	".\jslock.h"\
+	".\jsmsg.def"\
 	".\jsnum.h"\
 	".\jsobj.h"\
 	".\jsopcode.def"\
@@ -707,6 +715,7 @@ DEP_CPP_JSATO=\
 	".\jspubtd.h"\
 	".\jsregexp.h"\
 	".\jsscope.h"\
+	".\jsstddef.h"\
 	".\jsstr.h"\
 	".\os\aix.h"\
 	".\os\bsdi.h"\
@@ -736,7 +745,6 @@ DEP_CPP_JSATO=\
 	{$(INCLUDE)}"\sys\TYPES.H"\
 	
 NODEP_CPP_JSATO=\
-	".\pratomic.h"\
 	".\prcvar.h"\
 	".\prlock.h"\
 	
@@ -754,15 +762,18 @@ DEP_CPP_JSBOO=\
 	".\jsatom.h"\
 	".\jsbool.h"\
 	".\jscntxt.h"\
+	".\jsconfig.h"\
 	".\jsgc.h"\
 	".\jsinterp.h"\
 	".\jslock.h"\
+	".\jsmsg.def"\
 	".\jsnum.h"\
 	".\jsobj.h"\
 	".\jsprvtd.h"\
 	".\jspubtd.h"\
 	".\jsregexp.h"\
 	".\jsscope.h"\
+	".\jsstddef.h"\
 	".\jsstr.h"\
 	".\os\aix.h"\
 	".\os\bsdi.h"\
@@ -785,6 +796,7 @@ DEP_CPP_JSBOO=\
 	".\prmacos.h"\
 	".\prosdep.h"\
 	".\prpcos.h"\
+	".\prprintf.h"\
 	".\prtypes.h"\
 	".\prunixos.h"\
 	".\sunos4.h"\
@@ -792,7 +804,6 @@ DEP_CPP_JSBOO=\
 	{$(INCLUDE)}"\sys\TYPES.H"\
 	
 NODEP_CPP_JSBOO=\
-	".\pratomic.h"\
 	".\prcvar.h"\
 	".\prlock.h"\
 	
@@ -811,9 +822,11 @@ DEP_CPP_JSCNT=\
 	".\jscntxt.h"\
 	".\jsconfig.h"\
 	".\jsdbgapi.h"\
+	".\jsexn.h"\
 	".\jsgc.h"\
 	".\jsinterp.h"\
 	".\jslock.h"\
+	".\jsmsg.def"\
 	".\jsobj.h"\
 	".\jsopcode.def"\
 	".\jsopcode.h"\
@@ -823,6 +836,7 @@ DEP_CPP_JSCNT=\
 	".\jsscan.h"\
 	".\jsscope.h"\
 	".\jsscript.h"\
+	".\jsstddef.h"\
 	".\jsstr.h"\
 	".\os\aix.h"\
 	".\os\bsdi.h"\
@@ -854,7 +868,6 @@ DEP_CPP_JSCNT=\
 	
 NODEP_CPP_JSCNT=\
 	".\jsdebug.h"\
-	".\pratomic.h"\
 	".\prcvar.h"\
 	".\prlock.h"\
 	
@@ -876,12 +889,14 @@ DEP_CPP_JSDAT=\
 	".\jsgc.h"\
 	".\jsinterp.h"\
 	".\jslock.h"\
+	".\jsmsg.def"\
 	".\jsnum.h"\
 	".\jsobj.h"\
 	".\jsprvtd.h"\
 	".\jspubtd.h"\
 	".\jsregexp.h"\
 	".\jsscope.h"\
+	".\jsstddef.h"\
 	".\jsstr.h"\
 	".\os\aix.h"\
 	".\os\bsdi.h"\
@@ -899,6 +914,7 @@ DEP_CPP_JSDAT=\
 	".\prassert.h"\
 	".\prclist.h"\
 	".\prcpucfg.h"\
+	".\prdtoa.h"\
 	".\prhash.h"\
 	".\prlong.h"\
 	".\prmacos.h"\
@@ -913,7 +929,6 @@ DEP_CPP_JSDAT=\
 	{$(INCLUDE)}"\sys\TYPES.H"\
 	
 NODEP_CPP_JSDAT=\
-	".\pratomic.h"\
 	".\prcvar.h"\
 	".\prlock.h"\
 	
@@ -936,6 +951,7 @@ DEP_CPP_JSDBG=\
 	".\jsgc.h"\
 	".\jsinterp.h"\
 	".\jslock.h"\
+	".\jsmsg.def"\
 	".\jsobj.h"\
 	".\jsopcode.def"\
 	".\jsopcode.h"\
@@ -944,6 +960,7 @@ DEP_CPP_JSDBG=\
 	".\jsregexp.h"\
 	".\jsscope.h"\
 	".\jsscript.h"\
+	".\jsstddef.h"\
 	".\jsstr.h"\
 	".\os\aix.h"\
 	".\os\bsdi.h"\
@@ -973,7 +990,6 @@ DEP_CPP_JSDBG=\
 	{$(INCLUDE)}"\sys\TYPES.H"\
 	
 NODEP_CPP_JSDBG=\
-	".\pratomic.h"\
 	".\prcvar.h"\
 	".\prlock.h"\
 	
@@ -990,17 +1006,25 @@ DEP_CPP_JSEMI=\
 	".\jsapi.h"\
 	".\jsatom.h"\
 	".\jscntxt.h"\
+	".\jsconfig.h"\
 	".\jsemit.h"\
+	".\jsfun.h"\
 	".\jsgc.h"\
 	".\jsinterp.h"\
 	".\jslock.h"\
+	".\jsmsg.def"\
+	".\jsnum.h"\
 	".\jsobj.h"\
 	".\jsopcode.def"\
 	".\jsopcode.h"\
+	".\jsparse.h"\
 	".\jsprvtd.h"\
 	".\jspubtd.h"\
 	".\jsregexp.h"\
+	".\jsscan.h"\
 	".\jsscope.h"\
+	".\jsscript.h"\
+	".\jsstddef.h"\
 	".\jsstr.h"\
 	".\os\aix.h"\
 	".\os\bsdi.h"\
@@ -1030,7 +1054,7 @@ DEP_CPP_JSEMI=\
 	{$(INCLUDE)}"\sys\TYPES.H"\
 	
 NODEP_CPP_JSEMI=\
-	".\pratomic.h"\
+	".\jsdebug.h"\
 	".\prcvar.h"\
 	".\prlock.h"\
 	
@@ -1053,6 +1077,7 @@ DEP_CPP_JSFUN=\
 	".\jsgc.h"\
 	".\jsinterp.h"\
 	".\jslock.h"\
+	".\jsmsg.def"\
 	".\jsnum.h"\
 	".\jsobj.h"\
 	".\jsopcode.def"\
@@ -1064,7 +1089,9 @@ DEP_CPP_JSFUN=\
 	".\jsscan.h"\
 	".\jsscope.h"\
 	".\jsscript.h"\
+	".\jsstddef.h"\
 	".\jsstr.h"\
+	".\jsxdrapi.h"\
 	".\os\aix.h"\
 	".\os\bsdi.h"\
 	".\os\hpux.h"\
@@ -1094,7 +1121,6 @@ DEP_CPP_JSFUN=\
 	
 NODEP_CPP_JSFUN=\
 	".\jsdebug.h"\
-	".\pratomic.h"\
 	".\prcvar.h"\
 	".\prlock.h"\
 	
@@ -1115,6 +1141,7 @@ DEP_CPP_JSGC_=\
 	".\jsgc.h"\
 	".\jsinterp.h"\
 	".\jslock.h"\
+	".\jsmsg.def"\
 	".\jsnum.h"\
 	".\jsobj.h"\
 	".\jsprvtd.h"\
@@ -1122,6 +1149,7 @@ DEP_CPP_JSGC_=\
 	".\jsregexp.h"\
 	".\jsscope.h"\
 	".\jsscript.h"\
+	".\jsstddef.h"\
 	".\jsstr.h"\
 	".\os\aix.h"\
 	".\os\bsdi.h"\
@@ -1152,7 +1180,6 @@ DEP_CPP_JSGC_=\
 	{$(INCLUDE)}"\sys\TYPES.H"\
 	
 NODEP_CPP_JSGC_=\
-	".\pratomic.h"\
 	".\prcvar.h"\
 	".\prlock.h"\
 	
@@ -1177,6 +1204,7 @@ DEP_CPP_JSINT=\
 	".\jsgc.h"\
 	".\jsinterp.h"\
 	".\jslock.h"\
+	".\jsmsg.def"\
 	".\jsnum.h"\
 	".\jsobj.h"\
 	".\jsopcode.def"\
@@ -1186,6 +1214,7 @@ DEP_CPP_JSINT=\
 	".\jsregexp.h"\
 	".\jsscope.h"\
 	".\jsscript.h"\
+	".\jsstddef.h"\
 	".\jsstr.h"\
 	".\os\aix.h"\
 	".\os\bsdi.h"\
@@ -1215,7 +1244,6 @@ DEP_CPP_JSINT=\
 	{$(INCLUDE)}"\sys\TYPES.H"\
 	
 NODEP_CPP_JSINT=\
-	".\pratomic.h"\
 	".\prcvar.h"\
 	".\prlock.h"\
 	
@@ -1235,11 +1263,13 @@ DEP_CPP_JSLOC=\
 	".\jsgc.h"\
 	".\jsinterp.h"\
 	".\jslock.h"\
+	".\jsmsg.def"\
 	".\jsobj.h"\
 	".\jsprvtd.h"\
 	".\jspubtd.h"\
 	".\jsregexp.h"\
 	".\jsscope.h"\
+	".\jsstddef.h"\
 	".\jsstr.h"\
 	".\os\aix.h"\
 	".\os\bsdi.h"\
@@ -1269,7 +1299,6 @@ DEP_CPP_JSLOC=\
 	{$(INCLUDE)}"\sys\TYPES.H"\
 	
 NODEP_CPP_JSLOC=\
-	".\pratomic.h"\
 	".\prcvar.h"\
 	".\prlock.h"\
 	".\prthread.h"\
@@ -1287,16 +1316,19 @@ DEP_CPP_JSMAT=\
 	".\jsapi.h"\
 	".\jsatom.h"\
 	".\jscntxt.h"\
+	".\jsconfig.h"\
 	".\jsgc.h"\
 	".\jsinterp.h"\
 	".\jslock.h"\
 	".\jsmath.h"\
+	".\jsmsg.def"\
 	".\jsnum.h"\
 	".\jsobj.h"\
 	".\jsprvtd.h"\
 	".\jspubtd.h"\
 	".\jsregexp.h"\
 	".\jsscope.h"\
+	".\jsstddef.h"\
 	".\jsstr.h"\
 	".\os\aix.h"\
 	".\os\bsdi.h"\
@@ -1326,7 +1358,6 @@ DEP_CPP_JSMAT=\
 	{$(INCLUDE)}"\sys\TYPES.H"\
 	
 NODEP_CPP_JSMAT=\
-	".\pratomic.h"\
 	".\prcvar.h"\
 	".\prlock.h"\
 	
@@ -1347,6 +1378,7 @@ DEP_CPP_JSNUM=\
 	".\jsgc.h"\
 	".\jsinterp.h"\
 	".\jslock.h"\
+	".\jsmsg.def"\
 	".\jsnum.h"\
 	".\jsobj.h"\
 	".\jsopcode.def"\
@@ -1355,6 +1387,7 @@ DEP_CPP_JSNUM=\
 	".\jspubtd.h"\
 	".\jsregexp.h"\
 	".\jsscope.h"\
+	".\jsstddef.h"\
 	".\jsstr.h"\
 	".\os\aix.h"\
 	".\os\bsdi.h"\
@@ -1386,7 +1419,6 @@ DEP_CPP_JSNUM=\
 	{$(INCLUDE)}"\sys\TYPES.H"\
 	
 NODEP_CPP_JSNUM=\
-	".\pratomic.h"\
 	".\prcvar.h"\
 	".\prlock.h"\
 	
@@ -1410,6 +1442,7 @@ DEP_CPP_JSOBJ=\
 	".\jsgc.h"\
 	".\jsinterp.h"\
 	".\jslock.h"\
+	".\jsmsg.def"\
 	".\jsnum.h"\
 	".\jsobj.h"\
 	".\jsopcode.def"\
@@ -1419,7 +1452,9 @@ DEP_CPP_JSOBJ=\
 	".\jsregexp.h"\
 	".\jsscope.h"\
 	".\jsscript.h"\
+	".\jsstddef.h"\
 	".\jsstr.h"\
+	".\jsxdrapi.h"\
 	".\os\aix.h"\
 	".\os\bsdi.h"\
 	".\os\hpux.h"\
@@ -1449,7 +1484,6 @@ DEP_CPP_JSOBJ=\
 	{$(INCLUDE)}"\sys\TYPES.H"\
 	
 NODEP_CPP_JSOBJ=\
-	".\pratomic.h"\
 	".\prcvar.h"\
 	".\prlock.h"\
 	
@@ -1474,6 +1508,7 @@ DEP_CPP_JSOPC=\
 	".\jsgc.h"\
 	".\jsinterp.h"\
 	".\jslock.h"\
+	".\jsmsg.def"\
 	".\jsobj.h"\
 	".\jsopcode.def"\
 	".\jsopcode.h"\
@@ -1482,6 +1517,7 @@ DEP_CPP_JSOPC=\
 	".\jsregexp.h"\
 	".\jsscope.h"\
 	".\jsscript.h"\
+	".\jsstddef.h"\
 	".\jsstr.h"\
 	".\os\aix.h"\
 	".\os\bsdi.h"\
@@ -1513,7 +1549,6 @@ DEP_CPP_JSOPC=\
 	{$(INCLUDE)}"\sys\TYPES.H"\
 	
 NODEP_CPP_JSOPC=\
-	".\pratomic.h"\
 	".\prcvar.h"\
 	".\prlock.h"\
 	
@@ -1536,6 +1571,7 @@ DEP_CPP_JSPAR=\
 	".\jsgc.h"\
 	".\jsinterp.h"\
 	".\jslock.h"\
+	".\jsmsg.def"\
 	".\jsnum.h"\
 	".\jsobj.h"\
 	".\jsopcode.def"\
@@ -1547,6 +1583,7 @@ DEP_CPP_JSPAR=\
 	".\jsscan.h"\
 	".\jsscope.h"\
 	".\jsscript.h"\
+	".\jsstddef.h"\
 	".\jsstr.h"\
 	".\os\aix.h"\
 	".\os\bsdi.h"\
@@ -1578,7 +1615,6 @@ DEP_CPP_JSPAR=\
 	
 NODEP_CPP_JSPAR=\
 	".\jsdebug.h"\
-	".\pratomic.h"\
 	".\prcvar.h"\
 	".\prlock.h"\
 	
@@ -1601,6 +1637,7 @@ DEP_CPP_JSREG=\
 	".\jsgc.h"\
 	".\jsinterp.h"\
 	".\jslock.h"\
+	".\jsmsg.def"\
 	".\jsnum.h"\
 	".\jsobj.h"\
 	".\jsopcode.def"\
@@ -1609,7 +1646,9 @@ DEP_CPP_JSREG=\
 	".\jspubtd.h"\
 	".\jsregexp.h"\
 	".\jsscope.h"\
+	".\jsstddef.h"\
 	".\jsstr.h"\
+	".\jsxdrapi.h"\
 	".\os\aix.h"\
 	".\os\bsdi.h"\
 	".\os\hpux.h"\
@@ -1638,7 +1677,6 @@ DEP_CPP_JSREG=\
 	{$(INCLUDE)}"\sys\TYPES.H"\
 	
 NODEP_CPP_JSREG=\
-	".\pratomic.h"\
 	".\prcvar.h"\
 	".\prlock.h"\
 	
@@ -1656,10 +1694,10 @@ DEP_CPP_JSSCA=\
 	".\jsatom.h"\
 	".\jscntxt.h"\
 	".\jsconfig.h"\
-	".\jsemit.h"\
 	".\jsgc.h"\
 	".\jsinterp.h"\
 	".\jslock.h"\
+	".\jsmsg.def"\
 	".\jsnum.h"\
 	".\jsobj.h"\
 	".\jsopcode.def"\
@@ -1669,6 +1707,7 @@ DEP_CPP_JSSCA=\
 	".\jsregexp.h"\
 	".\jsscan.h"\
 	".\jsscope.h"\
+	".\jsstddef.h"\
 	".\jsstr.h"\
 	".\os\aix.h"\
 	".\os\bsdi.h"\
@@ -1701,7 +1740,6 @@ DEP_CPP_JSSCA=\
 	
 NODEP_CPP_JSSCA=\
 	".\jsdebug.h"\
-	".\pratomic.h"\
 	".\prcvar.h"\
 	".\prlock.h"\
 	
@@ -1721,12 +1759,14 @@ DEP_CPP_JSSCO=\
 	".\jsgc.h"\
 	".\jsinterp.h"\
 	".\jslock.h"\
+	".\jsmsg.def"\
 	".\jsnum.h"\
 	".\jsobj.h"\
 	".\jsprvtd.h"\
 	".\jspubtd.h"\
 	".\jsregexp.h"\
 	".\jsscope.h"\
+	".\jsstddef.h"\
 	".\jsstr.h"\
 	".\os\aix.h"\
 	".\os\bsdi.h"\
@@ -1756,7 +1796,6 @@ DEP_CPP_JSSCO=\
 	{$(INCLUDE)}"\sys\TYPES.H"\
 	
 NODEP_CPP_JSSCO=\
-	".\pratomic.h"\
 	".\prcvar.h"\
 	".\prlock.h"\
 	
@@ -1780,6 +1819,8 @@ DEP_CPP_JSSCR=\
 	".\jsgc.h"\
 	".\jsinterp.h"\
 	".\jslock.h"\
+	".\jsmsg.def"\
+	".\jsnum.h"\
 	".\jsobj.h"\
 	".\jsopcode.def"\
 	".\jsopcode.h"\
@@ -1788,6 +1829,7 @@ DEP_CPP_JSSCR=\
 	".\jsregexp.h"\
 	".\jsscope.h"\
 	".\jsscript.h"\
+	".\jsstddef.h"\
 	".\jsstr.h"\
 	".\jsxdrapi.h"\
 	".\os\aix.h"\
@@ -1811,6 +1853,7 @@ DEP_CPP_JSSCR=\
 	".\prmacos.h"\
 	".\prosdep.h"\
 	".\prpcos.h"\
+	".\prprintf.h"\
 	".\prtypes.h"\
 	".\prunixos.h"\
 	".\sunos4.h"\
@@ -1818,7 +1861,6 @@ DEP_CPP_JSSCR=\
 	{$(INCLUDE)}"\sys\TYPES.H"\
 	
 NODEP_CPP_JSSCR=\
-	".\pratomic.h"\
 	".\prcvar.h"\
 	".\prlock.h"\
 	
@@ -1841,12 +1883,16 @@ DEP_CPP_JSSTR=\
 	".\jsgc.h"\
 	".\jsinterp.h"\
 	".\jslock.h"\
+	".\jsmsg.def"\
 	".\jsnum.h"\
 	".\jsobj.h"\
+	".\jsopcode.def"\
+	".\jsopcode.h"\
 	".\jsprvtd.h"\
 	".\jspubtd.h"\
 	".\jsregexp.h"\
 	".\jsscope.h"\
+	".\jsstddef.h"\
 	".\jsstr.h"\
 	".\os\aix.h"\
 	".\os\bsdi.h"\
@@ -1877,7 +1923,6 @@ DEP_CPP_JSSTR=\
 	{$(INCLUDE)}"\sys\TYPES.H"\
 	
 NODEP_CPP_JSSTR=\
-	".\pratomic.h"\
 	".\prcvar.h"\
 	".\prlock.h"\
 	
@@ -1891,6 +1936,7 @@ NODEP_CPP_JSSTR=\
 
 SOURCE=.\prarena.c
 DEP_CPP_PRARE=\
+	".\jsstddef.h"\
 	".\prarena.h"\
 	".\prassert.h"\
 	".\prcpucfg.h"\
@@ -1924,6 +1970,8 @@ DEP_CPP_PRASS=\
 
 SOURCE=.\prdtoa.c
 DEP_CPP_PRDTO=\
+	".\jsstddef.h"\
+	".\prassert.h"\
 	".\prcpucfg.h"\
 	".\prdtoa.h"\
 	".\prprintf.h"\
@@ -1931,6 +1979,9 @@ DEP_CPP_PRDTO=\
 	".\sunos4.h"\
 	{$(INCLUDE)}"\sys\TYPES.H"\
 	
+NODEP_CPP_PRDTO=\
+	".\prlock.h"\
+	
 
 "$(INTDIR)\prdtoa.obj" : $(SOURCE) $(DEP_CPP_PRDTO) "$(INTDIR)"
 
@@ -2050,11 +2101,13 @@ DEP_CPP_JSAPI=\
 	".\jsconfig.h"\
 	".\jsdate.h"\
 	".\jsemit.h"\
+	".\jsexn.h"\
 	".\jsfun.h"\
 	".\jsgc.h"\
 	".\jsinterp.h"\
 	".\jslock.h"\
 	".\jsmath.h"\
+	".\jsmsg.def"\
 	".\jsnum.h"\
 	".\jsobj.h"\
 	".\jsopcode.def"\
@@ -2066,6 +2119,7 @@ DEP_CPP_JSAPI=\
 	".\jsscan.h"\
 	".\jsscope.h"\
 	".\jsscript.h"\
+	".\jsstddef.h"\
 	".\jsstr.h"\
 	".\os\aix.h"\
 	".\os\bsdi.h"\
@@ -2096,7 +2150,6 @@ DEP_CPP_JSAPI=\
 	
 NODEP_CPP_JSAPI=\
 	".\jsdebug.h"\
-	".\pratomic.h"\
 	".\prcvar.h"\
 	".\prlock.h"\
 	
@@ -2109,27 +2162,50 @@ NODEP_CPP_JSAPI=\
 # Begin Source File
 
 SOURCE=.\jsxdrapi.c
-
-!IF  "$(CFG)" == "js32 - Win32 Release"
-
 DEP_CPP_JSXDR=\
 	".\jsapi.h"\
 	".\jsatom.h"\
+	".\jscntxt.h"\
+	".\jsgc.h"\
+	".\jsinterp.h"\
 	".\jslock.h"\
+	".\jsmsg.def"\
 	".\jsobj.h"\
 	".\jsprvtd.h"\
 	".\jspubtd.h"\
+	".\jsregexp.h"\
 	".\jsscope.h"\
-	".\jsscript.h"\
+	".\jsstddef.h"\
+	".\jsstr.h"\
 	".\jsxdrapi.h"\
+	".\os\aix.h"\
+	".\os\bsdi.h"\
+	".\os\hpux.h"\
+	".\os\irix.h"\
+	".\os\linux.h"\
+	".\os\osf1.h"\
+	".\os\scoos.h"\
+	".\os\solaris.h"\
+	".\os\sunos.h"\
+	".\os\unixware.h"\
+	".\os\win16.h"\
+	".\os\win32.h"\
+	".\prarena.h"\
+	".\prassert.h"\
+	".\prclist.h"\
 	".\prcpucfg.h"\
 	".\prhash.h"\
+	".\prlong.h"\
+	".\prmacos.h"\
+	".\prosdep.h"\
+	".\prpcos.h"\
 	".\prtypes.h"\
+	".\prunixos.h"\
 	".\sunos4.h"\
+	{$(INCLUDE)}"\sys\STAT.H"\
 	{$(INCLUDE)}"\sys\TYPES.H"\
 	
 NODEP_CPP_JSXDR=\
-	".\pratomic.h"\
 	".\prcvar.h"\
 	".\prlock.h"\
 	
@@ -2137,31 +2213,116 @@ NODEP_CPP_JSXDR=\
 "$(INTDIR)\jsxdrapi.obj" : $(SOURCE) $(DEP_CPP_JSXDR) "$(INTDIR)"
 
 
+# End Source File
+################################################################################
+# Begin Source File
+
+SOURCE=.\jsexn.c
+
+!IF  "$(CFG)" == "js32 - Win32 Release"
+
+DEP_CPP_JSEXN=\
+	".\jsapi.h"\
+	".\jsatom.h"\
+	".\jscntxt.h"\
+	".\jsconfig.h"\
+	".\jsgc.h"\
+	".\jsinterp.h"\
+	".\jslock.h"\
+	".\jsmsg.def"\
+	".\jsobj.h"\
+	".\jsprvtd.h"\
+	".\jspubtd.h"\
+	".\jsregexp.h"\
+	".\jsscope.h"\
+	".\jsstddef.h"\
+	".\jsstr.h"\
+	".\os\aix.h"\
+	".\os\bsdi.h"\
+	".\os\hpux.h"\
+	".\os\irix.h"\
+	".\os\linux.h"\
+	".\os\osf1.h"\
+	".\os\scoos.h"\
+	".\os\solaris.h"\
+	".\os\sunos.h"\
+	".\os\unixware.h"\
+	".\os\win16.h"\
+	".\os\win32.h"\
+	".\prarena.h"\
+	".\prassert.h"\
+	".\prclist.h"\
+	".\prcpucfg.h"\
+	".\prhash.h"\
+	".\prlong.h"\
+	".\prmacos.h"\
+	".\prosdep.h"\
+	".\prpcos.h"\
+	".\prtypes.h"\
+	".\prunixos.h"\
+	".\sunos4.h"\
+	{$(INCLUDE)}"\sys\STAT.H"\
+	{$(INCLUDE)}"\sys\TYPES.H"\
+	
+NODEP_CPP_JSEXN=\
+	".\prcvar.h"\
+	".\prlock.h"\
+	
+
+"$(INTDIR)\jsexn.obj" : $(SOURCE) $(DEP_CPP_JSEXN) "$(INTDIR)"
+
+
 !ELSEIF  "$(CFG)" == "js32 - Win32 Debug"
 
-DEP_CPP_JSXDR=\
+DEP_CPP_JSEXN=\
 	".\jsapi.h"\
 	".\jsatom.h"\
+	".\jscntxt.h"\
+	".\jsconfig.h"\
+	".\jsgc.h"\
+	".\jsinterp.h"\
 	".\jslock.h"\
+	".\jsmsg.def"\
 	".\jsobj.h"\
 	".\jsprvtd.h"\
 	".\jspubtd.h"\
+	".\jsregexp.h"\
 	".\jsscope.h"\
-	".\jsscript.h"\
-	".\jsxdrapi.h"\
+	".\jsstddef.h"\
+	".\jsstr.h"\
+	".\os\aix.h"\
+	".\os\bsdi.h"\
+	".\os\hpux.h"\
+	".\os\irix.h"\
+	".\os\linux.h"\
+	".\os\osf1.h"\
+	".\os\scoos.h"\
+	".\os\solaris.h"\
+	".\os\sunos.h"\
+	".\os\unixware.h"\
+	".\os\win16.h"\
+	".\os\win32.h"\
+	".\prarena.h"\
+	".\prassert.h"\
+	".\prclist.h"\
 	".\prcpucfg.h"\
 	".\prhash.h"\
+	".\prlong.h"\
+	".\prmacos.h"\
+	".\prosdep.h"\
+	".\prpcos.h"\
 	".\prtypes.h"\
+	".\prunixos.h"\
 	".\sunos4.h"\
+	{$(INCLUDE)}"\sys\STAT.H"\
 	{$(INCLUDE)}"\sys\TYPES.H"\
 	
-NODEP_CPP_JSXDR=\
-	".\pratomic.h"\
+NODEP_CPP_JSEXN=\
 	".\prcvar.h"\
 	".\prlock.h"\
 	
 
-"$(INTDIR)\jsxdrapi.obj" : $(SOURCE) $(DEP_CPP_JSXDR) "$(INTDIR)"
+"$(INTDIR)\jsexn.obj" : $(SOURCE) $(DEP_CPP_JSEXN) "$(INTDIR)"
 
 
 !ENDIF 
diff --git a/mozilla/js/ref/js.mdp b/mozilla/js/ref/js.mdp
index 62490ada21c2c9a9323a41ed0dd5d2dac2fe81e9..18dad2b58be5fa0230ed9b85aae6aab7685d1821 100644
GIT binary patch
literal 17410
zcmeHO&2HO95FSRdeq1+pTBm6bMO?Rs7HEvvE_&!OGFmuri^4YQ92^uYawSormc%Y)
z%eOpKQ1l)85<T}N+SwIlJ25#M9}L&f5SB!XA7^KW%h`|Lj-DU<^t1+bI0Co_yv<z%
z{^f11Bk=cJ_ntey2j9YPunwPsjm3TU&QY142wY5fuji-J+|%<2)S-DX1it!u_m{(+
z-TiNlhel4+M%o>&1O5ee`~1ZZ`1S8&6`x3L<gqgN@3EFW{MZPC03HsF8OS7Ad$M*E
ztL?3|9oZfC>(jH}$H3~);90Y?_hll5kqhVN2f-JWE@V27N7A~nUWpkRp|v=(plU-1
z%F~e#(@oRF*I20XN$xWgiQIYpCE<0{?Tak-S(2mJwYElB>W!5(^O%72LyMr?iB&Fj
z=5r@W!&g4cNaO>Hp<GsDcQGgkj#8h`X%?oDcX(t1$F<LtmVG(#cHe};g_;_TCQLJL
zb0*Yr=Dn~c*Vgaq)-o-$RD$jtf{c;cGiWm%<*Bn&eHUeVAdI`V6edagTh=2QqxwFt
zGmT@iXHnEJDefU^Xip+tpeRE&Gh$ot(Oc=tB|A=5oUG_k_<v4Tfb+tem0A$2oX9`n
zDcIL+hUa8;x04l;ymEflK=w8guL5X6=U1H$Wtf)(AH7TO3W8?oWBD0YQ2b{humIdj
z*_}O5l1J^=jn?YH!Lxk`-~;F!3f-6aZZ1c~*Nu%S?SwXTevA`&=}_I~WlYcK{n?S3
zRFPESS#feLl34(&(78C$NmVXlC3OL5A`wK=H3(q&GR!trAX)`gBp~gfnX*6vvp6(G
z&LlwCmg9E>1Rb{YjzHj*Ms`O4(3OJR5g>HMaXSKn-5#0#MkIUH(L;A_DkQ8dA!16~
zNJHp!0V8aoM^kd=!RV7bqI|M;#$6hN4iy}cXbhw1C?WyDwx&s!z+hViLG*y~2!lxV
z46lbJk%XBA5l^V&jjoBv8>TVH#<Yc4(@iv!Sb0pOrngCX*~FNphC;MWng|_}n5G#k
z+R7q6Cr?h1bW=?=Ph++Dy$`XyMIqWVYEN9c#dBtV1@y;qa4%SCxw+oX_f=W`8jtbi
zlfg9%l+F}Pt#5={FF*qopcYP}i#X3N!H0J0<!w$P(1sfFt75Y|tpBn8huQ`ulCb{A
z`XB3mtpAm-1l<Tpsakg8#R^ZZzTRR5>wlFCW0}6=ixtT2%Ad<v|8vS9>wnMoS^s1G
zuUfHX{qI8iXZ^37{ke7V@_B~!zv?mvTmrhSI-q4(fd{x&_AxGpJ%mr-(M%2E&pC)d
z8@1nB(a*nLUh1$D1>Fxq++kZTXph$M)i@G)IM|%+Y|VDIXFK1`?EJj<d=K|s^&r>(
zl@?Ck+I`QD)K{xmx&Dvq|G56Iy2_iA70PW?W#}C*R%ZQ=^*^rvo0c7N{a<z2BiH{?
l1zBAGS21$9{?Dy6Tq+^v`oGd25_0`txmIu!zXSXX{sR;F!JhyC

literal 17766
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
OzaFk54s_&i75@UR$$c0A

diff --git a/mozilla/js/ref/macbuild/JSRef.mcp b/mozilla/js/ref/macbuild/JSRef.mcp
index 1cfcf6ed12304d647ba18dc564882a3a9a77d905..0b2a9871501ca66f4a10788314f7c3a84affc4d7 100644
GIT binary patch
delta 365
zcmbO;k!j9ErVYA0jPaYbcmx?Y+w<nJvSt;hR^&}y;HR+pfKVW_sRjcBgDWGD0Af2J
zl>oskQyCaIfJ_j-!op0!IX@-UJv9%^_Q~8FA$CT5vYFl-7LcyZNAyJ5m>C#^CO<QE
zo@{6qvUzefALGP;l*#q_DnMHlm^N!#wz9IZ^n%RWyu~g=V{=4~G#e|}zRdwew;3l_
zmy}KpDACybp~R4Bvc4+YWd3wfj!hgVKm7kcJ!|tuq2G*?)iZh7H*uUwW?+!nY^dr2
zwBXWY#d1+bmd)nn6BvcvJbgg^urpwgfih(`Un*zemrDowgX=_YNkI<KdXP_{Ku-n8
zSTOlZo0C-G1qKEtncR|epc3X6Fa-<@#cw7Dw2Lv7NleaY*JCoxnLMNYotViDpn@s6
JiD2{KY5_DLU~>Qf

delta 335
zcmbO;k!j9ErVYA0n+<vR7?~Lu7&hDS=Ce+APIlgWLCBcdR2?Yf$_ONY*cM2|191Wa
z14}Oh0|$@^<ZrZDs?DIq$gt7FXfA^`khWR6IYR7=_(XT1$trqtHeb?XXPaEBtINjN
z05qjx@&?_K$@h#?8HFd`F>z*gU|^gqWg0orD`9fIz6#Jz1*XlKmaVL8Aj5&K*<u%>
zG5JEF49CW;>nHvHe@AiiL80G_liwHff<)&0|GzvPC<4^PlP1o-**kX!<L29W-<T##
zmWeVlZ`LoHz_|H%1wWr$P6Pu3*NNPcf*hc!Apbyto*9raXY!XeC#iIxhnQq?OVWW#
qm|wsYFfe4QOb%!lV=7meoYAhwRNXUqM*BN4(?=kExrt!&;A#O9FkQX?