Bug 492720 libgjs failed to compile with js headers of Firefox 3.5 r=brendan

js/src/jsinterp.h

@@ -451,7 +451,8 @@ extern const uint16 js_PrimitiveTestFlags[];
      JSFUN_THISP_TEST(JSFUN_THISP_FLAGS((fun)->flags),                        \
                       js_PrimitiveTestFlags[JSVAL_TAG(thisv) - 1]))
 
-static inline JSObject *
+#ifdef __cplusplus /* Aargh, libgjs, bug 492720. */
+static JS_INLINE JSObject *
 js_ComputeThisForFrame(JSContext *cx, JSStackFrame *fp)
 {
     if (fp->flags & JSFRAME_COMPUTED_THIS)
@@ -463,6 +464,7 @@ js_ComputeThisForFrame(JSContext *cx, JSStackFrame *fp)
     fp->flags |= JSFRAME_COMPUTED_THIS;
     return obj;
 }
+#endif
 
 /*
  * NB: js_Invoke requires that cx is currently running JS (i.e., that cx->fp

js/src/jsobj.h

@@ -603,12 +603,14 @@ js_CheckForStringIndex(jsid id);
 extern void
 js_PurgeScopeChainHelper(JSContext *cx, JSObject *obj, jsid id);
 
+#ifdef __cplusplus /* Aargh, libgjs, bug 492720. */
 static JS_INLINE void
 js_PurgeScopeChain(JSContext *cx, JSObject *obj, jsid id)
 {
     if (OBJ_IS_DELEGATE(cx, obj))
         js_PurgeScopeChainHelper(cx, obj, id);
 }
+#endif
 
 /*
  * Find or create a property named by id in obj's scope, with the given getter