Bug 624205: fix warning due to mismatched export declarations on MarkContext.

This commit is contained in:
Mike Shaver 2011-01-08 18:55:54 -08:00
parent aed4f14946
commit 4329aad018
3 changed files with 3 additions and 3 deletions

View File

@ -2282,7 +2282,7 @@ class AutoGCRooter {
#ifdef __GNUC__
# pragma GCC visibility push(default)
#endif
friend void MarkContext(JSTracer *trc, JSContext *acx);
friend JS_FRIEND_API(void) MarkContext(JSTracer *trc, JSContext *acx);
friend void MarkRuntime(JSTracer *trc);
#ifdef __GNUC__
# pragma GCC visibility pop

View File

@ -1609,7 +1609,7 @@ AutoGCRooter::trace(JSTracer *trc)
namespace js {
void
JS_FRIEND_API(void)
MarkContext(JSTracer *trc, JSContext *acx)
{
/* Stack frames and slots are traced by StackSpace::mark. */

View File

@ -1626,7 +1626,7 @@ class TraceRecorder
* could lazily resolve. Since resolving adds properties to
* reserved slots, the tracer will never have imported them.
*/
return tree->globalSlots->offsetOf(nativeGlobalSlot(vp)) == -1;
return tree->globalSlots->offsetOf((uint16)nativeGlobalSlot(vp)) == -1;
}
pendingGlobalSlotToSet = -1;
return true;