Fix merge bustage.
authorDavid Anderson <danderson@mozilla.com>
Wed, 29 Aug 2012 18:04:42 -0700
changeset 105831 8f2d38db4b56d48e15ecac40f8303a869a07db9f
parent 105830 003feda8a0b3914c625acc784a1a441a3eeffaec
child 105832 02d8c81db5b485e59c744694f7ccd7d9cfe75208
child 105836 2a18a97558062bdf5a56839bc27474116edad035
push id55
push usershu@rfrn.org
push dateThu, 30 Aug 2012 01:33:09 +0000
milestone18.0a1
Fix merge bustage.
js/src/jsdbgapi.h
--- a/js/src/jsdbgapi.h
+++ b/js/src/jsdbgapi.h
@@ -8,17 +8,17 @@
 #ifndef jsdbgapi_h___
 #define jsdbgapi_h___
 /*
  * JS debugger API.
  */
 #include "jsapi.h"
 #include "jsprvtd.h"
 
-#if defined(__cplusplus) && defined(DEBUG)
+#if defined(__cplusplus)
 namespace JS {
 
 struct FrameDescription
 {
     JSScript *script;
     unsigned lineno;
     JSFunction *fun;
 };
@@ -37,19 +37,21 @@ FreeStackDescription(JSContext *cx, Stac
 
 extern JS_PUBLIC_API(char *)
 FormatStackDump(JSContext *cx, char *buf,
                     JSBool showArgs, JSBool showLocals,
                     JSBool showThisProps);
 
 }
 
+# ifdef DEBUG
 JS_FRIEND_API(void) js_DumpValue(const js::Value &val);
 JS_FRIEND_API(void) js_DumpId(jsid id);
 JS_FRIEND_API(void) js_DumpStackFrame(JSContext *cx, js::StackFrame *start = NULL);
+# endif
 #endif
 
 JS_BEGIN_EXTERN_C
 
 JS_FRIEND_API(void)
 js_DumpBacktrace(JSContext *cx);
 
 extern JS_PUBLIC_API(JSCompartment *)