From ee9851c473e3adff0c4139f21d356f2e311337c1 Mon Sep 17 00:00:00 2001
From: Jeff Walden <jwalden@mit.edu>
Date: Wed, 29 Jan 2014 17:57:36 -0800
Subject: [PATCH] Bustage fix, bug 947014 followup.  r=bustage in a CLOSED TREE

---
 js/src/jswrapper.h | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/js/src/jswrapper.h b/js/src/jswrapper.h
index 78419516ffd..2c65886c31f 100644
--- a/js/src/jswrapper.h
+++ b/js/src/jswrapper.h
@@ -33,9 +33,7 @@ class MOZ_STACK_CLASS WrapperOptions : public ProxyOptions {
         proto_.construct(cx);
     }
 
-    JSObject *proto() const {
-        return proto_.empty() ? Wrapper::defaultProto : proto_.ref();
-    }
+    inline JSObject *proto() const;
     WrapperOptions &setProto(JSObject *protoArg) {
         JS_ASSERT(!proto_.empty());
         proto_.ref() = protoArg;
@@ -95,6 +93,12 @@ class JS_FRIEND_API(Wrapper) : public DirectProxyHandler
     static JSObject *defaultProto;
 };
 
+inline JSObject *
+WrapperOptions::proto() const
+{
+    return proto_.empty() ? Wrapper::defaultProto : proto_.ref();
+}
+
 /* Base class for all cross compartment wrapper handlers. */
 class JS_FRIEND_API(CrossCompartmentWrapper) : public Wrapper
 {