Fix inconsistencies in the visiblity between type declarations and

forward declarations of the same name.

4 files changed, 57 insertions, 1 deletions

diff --git a/devel/xulrunner/distinfo b/devel/xulrunner/distinfo
index bb0e41bb58e..4eb61bf0fe6 100644
--- a/devel/xulrunner/distinfo
+++ b/devel/xulrunner/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.81 2012/10/27 16:38:00 ryoon Exp $
+$NetBSD: distinfo,v 1.82 2012/11/11 22:26:00 joerg Exp $
 
 SHA1 (firefox-16.0.2.source.tar.bz2) = 0ffe96896583e92561b341330ab09ddc50140dd1
 RMD160 (firefox-16.0.2.source.tar.bz2) = 74424c68e594fff842104385bb6c6f2a3a034fd2
@@ -64,6 +64,9 @@ SHA1 (patch-ipc_glue_SharedMemorySysV.h) = c82d7fd5f1a099da175107401c725cfd5ea81
 SHA1 (patch-js_src_config_system-headers) = 86f1aa66f8a35d6967c2cd03d05b6dd57209a690
 SHA1 (patch-js_src_jscpucfg.h) = afce65ca5964fb732d96cf22902f89cd02aedf0d
 SHA1 (patch-js_src_jsgc.cpp) = 0e617094a4b7d87cdf801d9bc4ac1f52d909a12a
+SHA1 (patch-js_src_jsinterp.cpp) = bee8bdde7dd951dbfbe5b049eb502f7412fbf8e6
+SHA1 (patch-js_src_jsproxy.h) = 74b3ab7856530a9c7ed2d9b12b47b0eeffb0d1ae
+SHA1 (patch-js_src_jsprvtd.h) = 3891d3a3f3a449d95f051da3a7365a1f1963f2b8
 SHA1 (patch-js_src_methodjit_MethodJIT.cpp) = f2b12fa554ec319b5848b1cc13ec17ef967b08d7
 SHA1 (patch-mb) = d1348344ad269df7008d857417551c594c9b9195
 SHA1 (patch-md) = 1369069901aacaa47d76753772236fe159d42362
diff --git a/devel/xulrunner/patches/patch-js_src_jsinterp.cpp b/devel/xulrunner/patches/patch-js_src_jsinterp.cpp
new file mode 100644
index 00000000000..cbab29f6ced
--- /dev/null
+++ b/devel/xulrunner/patches/patch-js_src_jsinterp.cpp
@@ -0,0 +1,23 @@
+$NetBSD: patch-js_src_jsinterp.cpp,v 1.1 2012/11/11 22:26:00 joerg Exp $
+
+--- js/src/jsinterp.cpp.orig	2012-11-04 13:25:04.000000000 +0000
++++ js/src/jsinterp.cpp
+@@ -3684,6 +3684,7 @@ BEGIN_CASE(JSOP_LEAVEBLOCK)
+ BEGIN_CASE(JSOP_LEAVEFORLETIN)
+ BEGIN_CASE(JSOP_LEAVEBLOCKEXPR)
+ {
++  {
+     DebugOnly<uint32_t> blockDepth = regs.fp()->blockChain().stackDepth();
+ 
+     regs.fp()->popBlock(cx);
+@@ -3698,7 +3699,9 @@ BEGIN_CASE(JSOP_LEAVEBLOCKEXPR)
+         regs.sp -= GET_UINT16(regs.pc);
+         JS_ASSERT(regs.stackDepth() == blockDepth + 1);
+         regs.sp[-1] = *vp;
+-    } else {
++    }
++  }
++    if (op != JSOP_LEAVEBLOCK && op != JSOP_LEAVEBLOCKEXPR)  {
+         /* Another op will pop; nothing to do here. */
+         len = JSOP_LEAVEFORLETIN_LENGTH;
+         DO_NEXT_OP(len);
diff --git a/devel/xulrunner/patches/patch-js_src_jsproxy.h b/devel/xulrunner/patches/patch-js_src_jsproxy.h
new file mode 100644
index 00000000000..3a67397cb33
--- /dev/null
+++ b/devel/xulrunner/patches/patch-js_src_jsproxy.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-js_src_jsproxy.h,v 1.1 2012/11/11 22:26:00 joerg Exp $
+
+--- js/src/jsproxy.h.orig	2012-10-24 14:32:54.000000000 +0000
++++ js/src/jsproxy.h
+@@ -13,7 +13,7 @@
+ 
+ namespace js {
+ 
+-class Wrapper;
++class JS_PUBLIC_API(Wrapper);
+ 
+ /*
+  * A proxy is a JSObject that implements generic behavior by providing custom
diff --git a/devel/xulrunner/patches/patch-js_src_jsprvtd.h b/devel/xulrunner/patches/patch-js_src_jsprvtd.h
new file mode 100644
index 00000000000..2add79b8e12
--- /dev/null
+++ b/devel/xulrunner/patches/patch-js_src_jsprvtd.h
@@ -0,0 +1,17 @@
+$NetBSD: patch-js_src_jsprvtd.h,v 1.1 2012/11/11 22:26:00 joerg Exp $
+
+--- js/src/jsprvtd.h.orig	2012-10-24 14:32:54.000000000 +0000
++++ js/src/jsprvtd.h
+@@ -146,9 +146,9 @@ struct TreeContext;
+ class UpvarCookie;
+ 
+ class Proxy;
+-class BaseProxyHandler;
+-class DirectWrapper;
+-class CrossCompartmentWrapper;
++class JS_PUBLIC_API(BaseProxyHandler);
++class JS_PUBLIC_API(DirectWrapper);
++class JS_PUBLIC_API(CrossCompartmentWrapper);
+ 
+ class TempAllocPolicy;
+ class RuntimeAllocPolicy;