[mw-devel] MW3 r1363 - in trunk/mozjs17.0.0: . js/src

[arthur at sucs.org]

Author: arthur
Date: 2014-05-30 09:33:07 +0100 (Fri, 30 May 2014)
New Revision: 1363

Added:
   trunk/mozjs17.0.0/Makefile
Modified:
   trunk/mozjs17.0.0/js/src/jsapi.h
Log:
Fix mistakes in the header that prevents it compiling


Added: trunk/mozjs17.0.0/Makefile
===================================================================
--- trunk/mozjs17.0.0/Makefile	                        (rev 0)
+++ trunk/mozjs17.0.0/Makefile	2014-05-30 08:33:07 UTC (rev 1363)
@@ -0,0 +1,10 @@
+.PHONY : all mozjs
+
+all: mozjs
+	
+mozjs:
+	pushd js/src/
+	configure --enable-thread  --with-pthreads --with-system-nspr --prefix ../../../mozjs
+	make
+	make install
+	popd

Modified: trunk/mozjs17.0.0/js/src/jsapi.h
===================================================================
--- trunk/mozjs17.0.0/js/src/jsapi.h	2014-05-30 08:27:23 UTC (rev 1362)
+++ trunk/mozjs17.0.0/js/src/jsapi.h	2014-05-30 08:33:07 UTC (rev 1363)
@@ -3792,7 +3792,7 @@
 JSVAL_TRACE_KIND(jsval v)
 {
     JS_ASSERT(JSVAL_IS_GCTHING(v));
-    return (JSGCTraceKind) JSVAL_TRACE_KIND_IMPL(JSVAL_TO_IMPL(v));
+    return (JSGCTraceKind) (JSVAL_TRACE_KIND_IMPL(JSVAL_TO_IMPL(v))?JSTRACE_STRING:JSTRACE_OBJECT);
 }
 
 /*