From 4329aad0182afbbc338cf2ef290a561ef12e92d0 Mon Sep 17 00:00:00 2001
From: Mike Shaver <shaver@mozilla.org>
Date: Sat, 8 Jan 2011 18:55:54 -0800
Subject: [PATCH] Bug 624205: fix warning due to mismatched export declarations
 on MarkContext.

---
 js/src/jscntxt.h  | 2 +-
 js/src/jsgc.cpp   | 2 +-
 js/src/jstracer.h | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/js/src/jscntxt.h b/js/src/jscntxt.h
index 69657112d3b..200218a3af2 100644
--- a/js/src/jscntxt.h
+++ b/js/src/jscntxt.h
@@ -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
diff --git a/js/src/jsgc.cpp b/js/src/jsgc.cpp
index 92a579faadb..aa1970be580 100644
--- a/js/src/jsgc.cpp
+++ b/js/src/jsgc.cpp
@@ -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. */
diff --git a/js/src/jstracer.h b/js/src/jstracer.h
index 40f1b7352ab..26a72d2cc9f 100644
--- a/js/src/jstracer.h
+++ b/js/src/jstracer.h
@@ -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;