Bug 791608 (part 1) - Fix compile warnings about JSObject::isFunction. r=jwalden.

--HG--
extra : rebase_source : 32e1bd6d65d4c2f6002b40ac0cbdd4955f2ddcdd

js/src/jsapi.cpp

@@ -70,6 +70,7 @@
 
 #include "jsatominlines.h"
 #include "jsinferinlines.h"
+#include "jsinterpinlines.h"
 #include "jsobjinlines.h"
 #include "jsscopeinlines.h"
 #include "jsscriptinlines.h"

js/src/jsfun.cpp

@@ -51,6 +51,7 @@
 #include "jsatominlines.h"
 #include "jsfuninlines.h"
 #include "jsinferinlines.h"
+#include "jsinterpinlines.h"
 #include "jsobjinlines.h"
 #include "jsscriptinlines.h"
 

js/src/jsinterp.h

@@ -90,16 +90,6 @@ ReportIsNotFunction(JSContext *cx, const Value *vp, MaybeConstruct construct = N
 extern JSObject *
 ValueToCallable(JSContext *cx, const Value *vp, MaybeConstruct construct = NO_CONSTRUCT);
 
-inline JSFunction *
-ReportIfNotFunction(JSContext *cx, const Value &v, MaybeConstruct construct = NO_CONSTRUCT)
-{
-    if (v.isObject() && v.toObject().isFunction())
-        return v.toObject().toFunction();
-
-    ReportIsNotFunction(cx, v, construct);
-    return NULL;
-}
-
 /*
  * InvokeKernel assumes that the given args have been pushed on the top of the
  * VM stack. Additionally, if 'args' is contained in a CallArgsList, that they

js/src/jsinterpinlines.h

@@ -955,6 +955,16 @@ UrshOperation(JSContext *cx, HandleScript script, jsbytecode *pc,
 
 #undef RELATIONAL_OP
 
+inline JSFunction *
+ReportIfNotFunction(JSContext *cx, const Value &v, MaybeConstruct construct = NO_CONSTRUCT)
+{
+    if (v.isObject() && v.toObject().isFunction())
+        return v.toObject().toFunction();
+
+    ReportIsNotFunction(cx, v, construct);
+    return NULL;
+}
+
 }  /* namespace js */
 
 #endif /* jsinterpinlines_h__ */