From 7b51fae2d8f6e365dbb56549d2d893eafa5b84e3 Mon Sep 17 00:00:00 2001
From: Bill McCloskey <wmccloskey@mozilla.com>
Date: Tue, 24 Jan 2012 10:21:12 -0800
Subject: [PATCH] Bug 720505 - Remove MarkRuntime from jsapi.h exports
 (r=Ms2ger)

---
 js/src/jsapi.h   |  7 -------
 js/src/jscntxt.h |  1 -
 js/src/jsgc.cpp  | 10 +---------
 3 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/js/src/jsapi.h b/js/src/jsapi.h
index 2cff34f4d797..c563528cdbff 100644
--- a/js/src/jsapi.h
+++ b/js/src/jsapi.h
@@ -818,10 +818,6 @@ class JS_PUBLIC_API(AutoCheckRequestDepth)
 
 #endif
 
-extern void
-MarkRuntime(JSTracer *trc);
-
-
 class JS_PUBLIC_API(AutoGCRooter) {
   public:
     AutoGCRooter(JSContext *cx, ptrdiff_t tag);
@@ -919,7 +915,6 @@ class AutoValueRooter : private AutoGCRooter
     }
 
     friend void AutoGCRooter::trace(JSTracer *trc);
-    friend void MarkRuntime(JSTracer *trc);
 
   private:
     Value val;
@@ -948,7 +943,6 @@ class AutoObjectRooter : private AutoGCRooter {
     }
 
     friend void AutoGCRooter::trace(JSTracer *trc);
-    friend void MarkRuntime(JSTracer *trc);
 
   private:
     JSObject *obj;
@@ -2022,7 +2016,6 @@ class AutoIdRooter : private AutoGCRooter
     }
 
     friend void AutoGCRooter::trace(JSTracer *trc);
-    friend void MarkRuntime(JSTracer *trc);
 
   private:
     jsid id_;
diff --git a/js/src/jscntxt.h b/js/src/jscntxt.h
index 9f574fdf2a2a..3917892433cb 100644
--- a/js/src/jscntxt.h
+++ b/js/src/jscntxt.h
@@ -1318,7 +1318,6 @@ class AutoXMLRooter : private AutoGCRooter {
     }
 
     friend void AutoGCRooter::trace(JSTracer *trc);
-    friend void JS::MarkRuntime(JSTracer *trc);
 
   private:
     JSXML * const xml;
diff --git a/js/src/jsgc.cpp b/js/src/jsgc.cpp
index d67c400ad86b..a3185c6e475b 100644
--- a/js/src/jsgc.cpp
+++ b/js/src/jsgc.cpp
@@ -2094,11 +2094,7 @@ MarkWeakReferences(GCMarker *gcmarker)
     JS_ASSERT(gcmarker->isMarkStackEmpty());
 }
 
-} // namespace js
-
-namespace JS {
-
-void
+static void
 MarkRuntime(JSTracer *trc)
 {
     JSRuntime *rt = trc->runtime;
@@ -2153,10 +2149,6 @@ MarkRuntime(JSTracer *trc)
     }
 }
 
-} // namespace JS
-
-namespace js {
-
 void
 TriggerGC(JSRuntime *rt, gcstats::Reason reason)
 {