Bug 774671 - Fix mismatched declarations. r=luke.
authorRafael Ávila de Espíndola <respindola@mozilla.com>
Tue, 17 Jul 2012 12:54:41 -0400
changeset 99511 ae22909cef5a5c1eab9df057bb85b70b59d3f7db
parent 99510 ba8463beab132c2c6be9a576d7d25d094671844a
child 99512 9799dad7067be231ace7ca7fabfd7197ac01cbce
push id23136
push userrespindola@mozilla.com
push dateTue, 17 Jul 2012 22:29:03 +0000
treeherdermozilla-central@ae22909cef5a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersluke
bugs774671
milestone17.0a1
first release with
nightly linux32
ae22909cef5a / 17.0a1 / 20120718030544 / files
nightly linux64
ae22909cef5a / 17.0a1 / 20120718030544 / files
nightly mac
ae22909cef5a / 17.0a1 / 20120718030544 / files
nightly win32
ae22909cef5a / 17.0a1 / 20120718030544 / files
nightly win64
ae22909cef5a / 17.0a1 / 20120718030544 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 774671 - Fix mismatched declarations. r=luke.
js/src/jsproxy.h
js/src/jsprvtd.h
--- a/js/src/jsproxy.h
+++ b/js/src/jsproxy.h
@@ -8,17 +8,17 @@
 #ifndef jsproxy_h___
 #define jsproxy_h___
 
 #include "jsapi.h"
 #include "jsfriendapi.h"
 
 namespace js {
 
-class Wrapper;
+class JS_FRIEND_API(Wrapper);
 
 /*
  * A proxy is a JSObject that implements generic behavior by providing custom
  * implementations for each object trap. The implementation for each trap is
  * provided by a C++ object stored on the proxy, known as its handler.
  *
  * A major use case for proxies is to forward each trap to another object,
  * known as its target. The target can be an arbitrary C++ object. Not every
--- a/js/src/jsprvtd.h
+++ b/js/src/jsprvtd.h
@@ -141,19 +141,19 @@ struct SharedContext;
 class TokenStream;
 struct Token;
 struct TokenPos;
 struct TokenPtr;
 struct TreeContext;
 class UpvarCookie;
 
 class Proxy;
-class BaseProxyHandler;
-class DirectWrapper;
-class CrossCompartmentWrapper;
+class JS_FRIEND_API(BaseProxyHandler);
+class JS_FRIEND_API(DirectWrapper);
+class JS_FRIEND_API(CrossCompartmentWrapper);
 
 class TempAllocPolicy;
 class RuntimeAllocPolicy;
 
 class GlobalObject;
 
 template <typename K,
           typename V,