SF.net SVN: openvrml:[4306] trunk

[<br...@us...>]

Revision: 4306
          http://openvrml.svn.sourceforge.net/openvrml/?rev=4306&view=rev
Author:   braden
Date:     2012-07-26 22:04:51 +0000 (Thu, 26 Jul 2012)
Log Message:
-----------
XULRunner 14.0 removes JS_FinalizeStub.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/configure.ac
    trunk/src/script/javascript.cpp

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2012-07-26 06:38:18 UTC (rev 4305)
+++ trunk/ChangeLog	2012-07-26 22:04:51 UTC (rev 4306)
@@ -1,5 +1,12 @@
 2012-07-26 Braden McDaniel  <br...@en...>
 
+	XULRunner 14.0 removes JS_FinalizeStub.
+
+	* configure.ac
+	* src/script/javascript.cpp
+
+2012-07-26 Braden McDaniel  <br...@en...>
+
 	* src/script/javascript.cpp: JS_RemoveValueRoot no longer returns
 	a value; simply change the existing wrapper to return void.
 	Should be backward compatible (since we could never do anything

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2012-07-26 06:38:18 UTC (rev 4305)
+++ trunk/configure.ac	2012-07-26 22:04:51 UTC (rev 4306)
@@ -286,6 +286,25 @@
                  [Defined if JS_ConstructObject is missing the prototype argument])])
 
 #
+# XULRunner 14.0 removes JS_FinalizeStub.
+#
+AC_CACHE_CHECK([whether SpiderMonkey has JS_FinalizeStub],
+[ov_cv_js_has_finalizestub],
+[ov_cv_js_has_finalizestub=no
+ov_save_CPPFLAGS=$CPPFLAGS
+CPPFLAGS="$JS_CFLAGS $CPPFLAGS"
+AC_LANG_ASSERT([C])
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
+[[#include <jsapi.h]],
+[[JS_FinalizeStub(0, 0)]])],
+[ov_cv_js_has_finalizestub=yes])
+CPPFLAGS=$ov_save_CPPFLAGS
+])
+AS_IF([test X$ov_cv_js_has_finalizestub = Xyes],
+      [AC_DEFINE([OPENVRML_JS_HAS_FINALIZESTUB], [1],
+                 [Defined if JS_FinalizeStub is declared in jsapi.h])])
+
+#
 # openvrml-xembed and openvrml-player both use GOption, which was
 # introduced in GLib 2.6.
 #

Modified: trunk/src/script/javascript.cpp
===================================================================
--- trunk/src/script/javascript.cpp	2012-07-26 06:38:18 UTC (rev 4305)
+++ trunk/src/script/javascript.cpp	2012-07-26 22:04:51 UTC (rev 4306)
@@ -378,7 +378,11 @@
             JS_EnumerateStub, // enumerate
             JS_ResolveStub,   // resolve
             JS_ConvertStub,   // convert
+#ifdef OPENVRML_JS_HAS_FINALIZESTUB
             JS_FinalizeStub,  // finalize
+#else
+            0,                // finalize
+#endif
             0,                // getObjectOps
             0,                // checkAccess
             0,                // call
@@ -402,7 +406,11 @@
             JS_EnumerateStub, // enumerate
             JS_ResolveStub,   // resolve
             JS_ConvertStub,   // convert
+#ifdef OPENVRML_JS_HAS_FINALIZESTUB
             JS_FinalizeStub,  // finalize
+#else
+            0,                // finalize
+#endif
             0,                // getObjectOps
             0,                // checkAccess
             0,                // call
@@ -7457,7 +7465,11 @@
         JS_EnumerateStub,    // enumerate
         JS_ResolveStub,      // resolve
         JS_ConvertStub,      // convert
+#ifdef OPENVRML_JS_HAS_FINALIZESTUB
         JS_FinalizeStub,     // finalize
+#else
+        0,                   // finalize
+#endif
         0,                   // getObjectOps
         0,                   // checkAccess
         0,                   // call

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.