From f9f2477f8efb62c68db1b29123e02124ebfd79f8 Mon Sep 17 00:00:00 2001 From: "timeless%mozdev.org" Date: Fri, 6 May 2005 21:44:32 +0000 Subject: [PATCH] Bug 292397 JS_VERSION 130 doesn't build r=brendan a=asa --- js/src/jsapi.c | 2 +- js/src/jsatom.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/js/src/jsapi.c b/js/src/jsapi.c index ab739d8e87b..64002a565e0 100644 --- a/js/src/jsapi.c +++ b/js/src/jsapi.c @@ -4399,7 +4399,7 @@ JS_DropExceptionState(JSContext *cx, JSExceptionState *state) JS_PUBLIC_API(JSErrorReport *) JS_ErrorFromException(JSContext *cx, jsval v) { -#if JS_HAS_EXCEPTIONS +#if JS_HAS_ERROR_EXCEPTIONS CHECK_REQUEST(cx); return js_ErrorFromException(cx, v); #else diff --git a/js/src/jsatom.c b/js/src/jsatom.c index 2f15ea2555b..c0e9c1bb7b4 100644 --- a/js/src/jsatom.c +++ b/js/src/jsatom.c @@ -63,7 +63,9 @@ js_AtomToPrintableString(JSContext *cx, JSAtom *atom) return js_ValueToPrintableString(cx, ATOM_KEY(atom)); } +#if JS_HAS_ERROR_EXCEPTIONS extern const char js_Error_str[]; /* trivial, from jsexn.h */ +#endif /* * Keep this in sync with jspubtd.h -- an assertion below will insist that @@ -301,7 +303,9 @@ js_InitPinnedAtoms(JSContext *cx, JSAtomState *state) FROB(BooleanAtom, js_Boolean_str); FROB(CallAtom, js_Call_str); FROB(DateAtom, js_Date_str); +#if JS_HAS_ERROR_EXCEPTIONS FROB(ErrorAtom, js_Error_str); +#endif FROB(FunctionAtom, js_Function_str); FROB(MathAtom, js_Math_str); FROB(NumberAtom, js_Number_str);