Fix merge bustage.

This commit is contained in:
David Anderson 2012-08-29 18:04:42 -07:00
parent e66b11e262
commit ad0f13bc58

View File

@ -13,7 +13,7 @@
#include "jsapi.h" #include "jsapi.h"
#include "jsprvtd.h" #include "jsprvtd.h"
#if defined(__cplusplus) && defined(DEBUG) #if defined(__cplusplus)
namespace JS { namespace JS {
struct FrameDescription struct FrameDescription
@ -42,10 +42,12 @@ FormatStackDump(JSContext *cx, char *buf,
} }
# ifdef DEBUG
JS_FRIEND_API(void) js_DumpValue(const js::Value &val); JS_FRIEND_API(void) js_DumpValue(const js::Value &val);
JS_FRIEND_API(void) js_DumpId(jsid id); JS_FRIEND_API(void) js_DumpId(jsid id);
JS_FRIEND_API(void) js_DumpStackFrame(JSContext *cx, js::StackFrame *start = NULL); JS_FRIEND_API(void) js_DumpStackFrame(JSContext *cx, js::StackFrame *start = NULL);
# endif # endif
#endif
JS_BEGIN_EXTERN_C JS_BEGIN_EXTERN_C