SF.net SVN: openvrml:[4272] trunk

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

Revision: 4272
          http://openvrml.svn.sourceforge.net/openvrml/?rev=4272&view=rev
Author:   braden
Date:     2012-04-29 06:55:38 +0000 (Sun, 29 Apr 2012)
Log Message:
-----------
Fix OPENVRML_JS_CONSTRUCTOBJECT_WITHOUT_PROTO conditional to be #ifdef.

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2012-04-29 03:06:39 UTC (rev 4271)
+++ trunk/ChangeLog	2012-04-29 06:55:38 UTC (rev 4272)
@@ -1,3 +1,9 @@
+2012-04-29 Braden McDaniel  <br...@en...>
+
+	* src/script/javascript.cpp: Fix
+	OPENVRML_JS_CONSTRUCTOBJECT_WITHOUT_PROTO conditional to be
+	#ifdef.
+
 2012-04-28 Braden McDaniel  <br...@en...>
 
 	XULRunner 12.0 removes the JSObject* prototype argument from

Modified: trunk/src/script/javascript.cpp
===================================================================
--- trunk/src/script/javascript.cpp	2012-04-29 03:06:39 UTC (rev 4271)
+++ trunk/src/script/javascript.cpp	2012-04-29 06:55:38 UTC (rev 4272)
@@ -118,7 +118,7 @@
                         JSObject * const parent)
     {
         assert(!proto);
-# ifndef OPENVRML_JS_CONSTRUCTOBJECT_WITHOUT_PROTO
+# ifdef OPENVRML_JS_CONSTRUCTOBJECT_WITHOUT_PROTO
         return JS_ConstructObject(cx, clasp, parent);
 # else
         return JS_ConstructObject(cx, clasp, proto, parent);
@@ -135,7 +135,7 @@
                                        jsval * const argv)
     {
         assert(!proto);
-# ifndef OPENVRML_JS_CONSTRUCTOBJECT_WITHOUT_PROTO
+# ifdef OPENVRML_JS_CONSTRUCTOBJECT_WITHOUT_PROTO
         return js_construct_object_with_arguments(cx, clasp, parent, argc, argv);
 # else
         return js_construct_object_with_arguments(cx, clasp, proto, parent,

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