bug 474358 - assertion isOuterWindow fix for windows breakage
authorRob Campbell <rcampbell@mozilla.com>
Fri, 24 Jul 2009 11:49:37 -0300
changeset 30641 0d0753d47643995e07a649f9289ea848a54053f1
parent 30640 802c2be7e2e61c6f7342b4a69fdae350bacfd9a1
child 30642 a5e8146de675b4d39a23a18b68efc3de99402f49
push idunknown
push userunknown
push dateunknown
bugs474358
milestone1.9.2a1pre
bug 474358 - assertion isOuterWindow fix for windows breakage
js/jsd/jsd_val.c
--- a/js/jsd/jsd_val.c
+++ b/js/jsd/jsd_val.c
@@ -36,28 +36,31 @@
  * ***** END LICENSE BLOCK ***** */
 
 /*
  * JavaScript Debugging support - Value and Property support
  */
 
 #include "jsd.h"
 #include "jsapi.h"
+#include "jspubtd.h"
 
 /*
  * Lifted with slight modification from jsobj.h
  */
 
 #define OBJ_TO_OUTER_OBJECT(cx, obj)                                \
+do {                                                                \
     JSClass *clasp_ = JS_GetClass(cx, obj);                         \
     if (clasp_->flags & JSCLASS_IS_EXTENDED) {                      \
         JSExtendedClass *xclasp_ = (JSExtendedClass*) clasp_;       \
         if (xclasp_->outerObject)                                   \
             obj = xclasp_->outerObject(cx, obj);                    \
-    }
+    }                                                               \
+} while(0)
 
 #ifdef DEBUG
 void JSD_ASSERT_VALID_VALUE(JSDValue* jsdval)
 {
     JS_ASSERT(jsdval);
     JS_ASSERT(jsdval->nref > 0);
     if(!JS_CLIST_IS_EMPTY(&jsdval->props))
     {