From e9b6ede2ecc932157bdbf9873dd04384f4059e45 Mon Sep 17 00:00:00 2001 From: Bobby Holley Date: Tue, 2 Jul 2013 16:34:33 -0600 Subject: [PATCH] Bug 888104 - Fix xpcshell linkage error on windows. r=me CLOSED TREE --- js/xpconnect/src/nsCxPusher.cpp | 1 + js/xpconnect/src/nsCxPusher.h | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/js/xpconnect/src/nsCxPusher.cpp b/js/xpconnect/src/nsCxPusher.cpp index b1456b40e4b1..c6d3240cb99e 100644 --- a/js/xpconnect/src/nsCxPusher.cpp +++ b/js/xpconnect/src/nsCxPusher.cpp @@ -139,6 +139,7 @@ AutoCxPusher::AutoCxPusher(JSContext* cx, bool allowNull) : mScriptIsRunning(fal #endif } +NS_EXPORT AutoCxPusher::~AutoCxPusher() { // Leave the request before popping. diff --git a/js/xpconnect/src/nsCxPusher.h b/js/xpconnect/src/nsCxPusher.h index b734f8f1eed1..ac062bcef602 100644 --- a/js/xpconnect/src/nsCxPusher.h +++ b/js/xpconnect/src/nsCxPusher.h @@ -26,7 +26,8 @@ class MOZ_STACK_CLASS AutoCxPusher { public: AutoCxPusher(JSContext *aCx, bool aAllowNull = false); - ~AutoCxPusher(); + // XPCShell uses an nsCxPusher, which contains an AutoCxPusher. + NS_EXPORT ~AutoCxPusher(); nsIScriptContext* GetScriptContext() { return mScx; }