From 6eda94e535b5387fff07412388e9450d1fc9a057 Mon Sep 17 00:00:00 2001
From: "amusil%netscape.com"
 <amusil%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 4 Feb 1999 00:18:22 +0000
Subject: [PATCH] Added oji, liveconnect and caps shared libs to the registry.

git-svn-id: svn://10.0.0.236/trunk@19609 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/js/macbuild/LiveConnect.mcp           | Bin 85656 -> 76884 bytes
 mozilla/layout/macbuild/layout.mcp            | Bin 121105 -> 121105 bytes
 mozilla/modules/oji/macbuild/oji.mcp          | Bin 86920 -> 86920 bytes
 mozilla/modules/oji/src/nsJVMManager.cpp      |   2 ++
 .../modules/plugin/base/macbuild/plugin.mcp   | Bin 128789 -> 128789 bytes
 mozilla/modules/plugin/macbuild/plugin.mcp    | Bin 128789 -> 128789 bytes
 6 files changed, 2 insertions(+)

diff --git a/mozilla/js/macbuild/LiveConnect.mcp b/mozilla/js/macbuild/LiveConnect.mcp
index a7707574f8319489df885b5eb432c277e1389da3..875b94a13bbd8ccc4286827ffb3f6835e10e2439 100644
GIT binary patch
delta 387
zcmbO+m-WgG7Lnxq{2T@b24)5ZMhyl=g*yz4N-P^iE_1TqQ~US-|I~Y%-*LLLu-|=g
zn}NY?!REw{-;9&Z1;l^?6aW7|eg-J;lX3DLWsc3ELXWuX85tO~-8_9<fwT^k)`ik~
zP+A{K8$fA8C|wMtji9tKls19Vrcl}(N*6)t5-45f9uzuxo7{eFpxsqav1}*}^q>QC
zcmdFx2*7A^QDCB@;$$h6q{+$(H~IN}Ji}a_{r&u0okQYXd?qJ8ahw>idGmk8i`v-b
z_H4f6rz^2}dZiQ7rW8iT&HKx5F>a3kDa1H2pnLPrS1wFIkvoi=9~UZZ*zW1V*ucWf
W@c+Q}GaiihSeVi|rmyj3d;<X8&~$_V

delta 412
zcmca|gJs5CR*~fV{2T@b24)5ZMhyl=X9WgE7mtl1mpR$Z{2ntfNKV--y-0*<GZT+7
z6T5+V>Hq)Vu5Vsg`I~XFxqui@pqha}<pNOPC*$Nh${d?Rg&uL&1C7#l^Yn2A(mGID
z7fS0vX?-Yd0HqC~bP1F;g3`uN+5}3QLTPg-T@0m5p>(->Q0U}sa{Il3c2`5ivY|B4
zmkz9&n;4vnQWHy3J@bl767!hfvM9tG8s!xSr55BDXO`p_Rk{T^o8%RHx&#;+0;%BA
zg3SlyZ5X+^eKN~Zo%8eZQj;eaDwItOXxjW=@uD`Sc=zTze!3D91NtZb)>^gsdlDDZ
z=KbZj7&piN6k?nh(7pNRD;JQ+9mdU%3zar(KKTEL8Z)C3%k~a6#(OMGg%74@XfwV6
E09$Q-U;qFB

diff --git a/mozilla/layout/macbuild/layout.mcp b/mozilla/layout/macbuild/layout.mcp
index bf43b1ca6f8aae90892fb9a7910b1a4ec24cbfc9..2ef2bb0f1cead96a9b55440d086015128a395f9a 100644
GIT binary patch
delta 1859
zcmZwGU2Kz89LMqVf7;qnHW@FoOb`(^UnYoL!7em%Q5GVj>tG;J*v2Sqjt+!k2sdL1
zaW@i}Cy3D-AQ>~DXn0IIlMcNhV|E(|bG|W95fRW)<we1ndY(Stg_zKbexBd|oIdAy
zPS3yXn7{3q|KnB}pHfN<c+HnrSsM*0`yGkY_|F#~&1B9VwbQkw9!ctw=yl(5GumZO
zTNf1hOb>TP?AG;}nf}4~S2LLps}qqzxhuMLSI|FLIyRHJy|cqqEW3U8NWO00AM!f4
zZ(C5NFYkNa-gsbh!F_IO4|gv0=umRD-IUA;H2aiQy>QXukg*2quoho(mHn>j0`+q0
zZ<4DRzerwA{uwV*ufWB|Rc2vnV?rAL#M}6ntMv*#jjLSc0C_ep!LY9Eo>OQR=wRYr
zd^@XtxBD^Y{Z}%5JVtOC`moYf4dIW}*SN|9WIuTf<{|f&J<Q87HaqYCD203`&LA(v
ziPR6{lUU-aesQ%}P~9R2ka<=kd2Cr_RfRcc=A%D7S+L0L0ZYnicZ!U@QxiFk+i*MX
zz@1rju&2n`(K&9_DrNKpcH>Fx!7ng{z1WBScnVMBmv{!x8nZh(K;bJK#INxi{1(5%
z@9`Y+SIc=aM_+y*a|GlkvN`(APA>^(UM?}fUnKN^{7U@_Ud3zp8~%>NcpYgK`GZW$
z$c=@~*=ClT3~&~NUXsyXn#B0ucn9y|KRAN_V#d`{DEH2i^5)gYV|rd{!d$Zh2l+ue
z9>QmFuB-K6R=qtn!#Oz*Q=Nj3<5ZlCh4>V{iuKrl&)_V40w2NA)|+NtLr>|Q>O8{=
z#)@4fgk|_5mSY$rNZZOXH(N#2t8h88j=V)aVzfd&-Pv0-#yp0*QTkHvOuZ*LP6zuY
z6q#z&ooubc^%%nqy1Z|?{v`RH1aw7LSa)<iWUh{Pg)5$8#>>SQcVv5CsTVveHmN{M
zZmc$5UtPDMc8e4beBP2<w>J8ERnwMe-1o-T+?KphtRcQ+Yivz)b9j^0a?q>f1Eu7|
zz6BpiP?w*|wTDJ_6(nj3<&H<E8*>urerXgZzb60Bd$Z&Ak#t~sVklp3S&73FrKB@4
Zl5(zl`enCAW+hghk#Ux>VL;yZ{s%&t(QE(!

delta 1876
zcmYM!e@vBC7{KxKyu1e2vOr@<l96C)X5e4OTpBDyX5<AW6*aLmK}0s^R=FDe;l@8U
zy`2%xHHU6!D_hKW?WK)2H+7)*BL2AkD5YPfSXy3xr5WsY?mb`D{o{W2JkNRG^S<YO
z&Iuh%4INDFY>|wJQYz}2KUX<ThKRRQDr-}t?t^&z{-76IU6kUt7D$exhr3F=mUZzw
zQ#-8G%hi5mwmcNw@^Mxo6OW(&Y`@7kUdQ&KbXlQyx6cn1m+8T_IbPGAO_}y4-f-8e
zDN>{7bQgM?y4}&uX4cj7%3murzJ+V?ZLG0MyH))}ej)j7#7n4OCSFSX8xE4M!q<%}
z&BPL7Kn!o=-+15Zyou9sl~wi-&%hv7>Z+cCY%{@r2Daj-N%gLtXA|$goZ%U`2;aa_
zxY()&@E7uHtnvtPDsceEAorIYj7u{%C*J=V66p+_L|l#I$bW%T@p-GdYIT@U-6I~2
zjB^@^A1$k@4w_aoKmBcQX1Q4drWBS~=mptmFOkjo9&W*paBEVXbu2%zq6IeV6j42j
zJ=lxK@HmDsf_-=b`|%{6!qa%hm|W2)iL-bP&*KIB9)G}#cnSH`@*^>=FFzC00`e=d
zY5nHJUJ`m<u2A3;341`Uk^de4!0UJe|HQxWCdTj<vSsAXyyoO)mb(<_1z|7A$X<Gq
z`UCt2AL73_gu@uOItu0gUQ+Iuy3LJxR(R}8vjTg$pab_|A<ncqk0;ez!jlr6^Ay<$
z_#Ecoc+AFWxB=H=1HOna;1qlsN4DNX^BQ_WBq#9<%cxDZN-37%0<6H1bFh+_^FtQf
z*vTi)b{5VR;k=YjsDEj6N?qL*$q$&vunVQHMDoPdfxg^)lUv6v>#!c1aHFp1%bjKh
zzC$7tv#=KJ5uyjWr)HSZv&fbw)%|@%df|8B*`~76oDo$)mG(iJvrl!rl&d=Cb|%h^
z!2HhIK<w_Jl11+~ic;?uxoWMc2hE2+pp+bKEB;!tbVdJT-oVg>abDo^ff?rS8}UoV
zN}c$%*-|e$){y4MPDq1<g00@{Bk7Lco+qy)t4C7&B@^YtuSV4<<!o&$?v*@08kT#G
acj(%B@t2>JVUa?A*=c#gG1f=rbN4?Mpv6Z3

diff --git a/mozilla/modules/oji/macbuild/oji.mcp b/mozilla/modules/oji/macbuild/oji.mcp
index 0069f1262354eae9f754766876ea2b59046e5b87..ece874095e3df97ea8ca7532d8dd3615930521a9 100644
GIT binary patch
delta 992
zcmXw2Z%9*76u;-ry-hc#`LE$bEy1O&nV4k$eRI0zG+Q_#FojK5nWm;of}-UI|A1dw
zm)IAfh{&Qq+Z8nHgMsxW3F(s&nGmcm{WI)~2J5`{)(_74o%=iYp7YLq?@i9ACuh`i
zPoO-N5Rwn*&>D~?(C!hUaT21%P+k*H;~9^2SXwGzA~mrxl~GLq2rwfpV(qk+xphAF
zT$M)&VN}(mK_-;Ykgbq8GtK<2YBd43c-bOUXtA4J>KL*W@RCGPm*et|c-y*$dIkg5
z;R}5}($X{Hw-5C9`?~^GChD(*+)nPyR0E7LS5^?l`J1c&FlTZa_ZWlwH5-MWVzF&I
zzus<w+f_RpP6@#N)L8V`q{7kE(ujPF$J~j)dbKMd_a4@fq-X2;bZ&{NAyQQj{9wmk
z;FI<$Rmh#dVrK<@{(h;DrZM9b<I32YqsS9{tMV}L=xiBP+oc@KjTETmtK+$mdz6*e
zt?^WkDUrQ$<Y+dMr(>}ft9WJ?_-AJpW$BT(yx2EIb!z#7%_1QtzT90ZESL>opisEr
zNP`p#+5FeV(NzBNv7q9+C(vEKwv>;BwG^M!2qAYj=5zuto=&FhXZ3?3AwFhZoW(fX
z;@l8tJ9}C)nyyR~_i$v5kOa0hzfT@K#cKjq8*%gKyyXscEQd2(V5O~MxWNUT+1gb+
zC0+{j4ItyS{s%0EUrPHrio@TKg=fDpeRCnd8Qu#)*u-twgG2sv#P#(6#v&S`dk*DI
zS#Ks%VVf+I;4MM~y`uY1qE@fyW7GJ#E-89mC2G<uKve(0W*SA$ccCD?5X8gN_zh|Y
zgL309E2yl?I-w$Rt#Y9EHO7r-2-rbqQ1s*9F?L8Q7P*1Wr|3D@jNlI<fo`J9Q1oF9
z#!YAlD*Zi4vhI54sK$l#R0z6_E<V{+>A(j`C8SM6x1toXlwsVAhIrH&wzNUXA?dhP
ZNlzItZk3XR%to<fyj;&;6r{@{{{Yte?H2$5

delta 907
zcmYk5Z%9*76u{5DZ+qLEnuRWzg2N#D<G-n-)zas5OQ+Z@!?08|6|Kbi=Yy1B1=i9a
z)+OebNF<WzgXUEV>BBxO`eKpkhawClP${*bKJ|xn-tLgj<DPTw@0@$jJNLcoozQwG
zv{O$=Oe_Fc2r3+QHm@((hyD<bF#uf}fF50(cY2z7S{oayb8>t8TC92J+nah=BHhnc
zh?y1B!YC~f0)$l>+n7PJvlW_<NN`si>a#7Ozrfg5Z5n?d&1=}9q9D&QC`RUp_W0Z#
zyevUWShZ<@FPOTC&#h-=F}rw8;$W(7dD9vSEv)l_vq^+0$}jfg=|iGnqthwu)%0bl
z3$*;&84cliMR#;8qu#7rUY`XxTFb4<Z^FwPO_YCpEKA&f9o09RO!$r(1LbiwNe13+
z-%a@HWHhyvS2`%b;cU&~r!n!$RM9LAZ!FzVZhE~lx0XhdZ)+BV*_dQ=isWMvTgYO0
zenL2VyIFKJiwkdk#e4WH&msI^^Ds3^;ZxnK0GN58#VYfiU037y{h>JvUz>@gK6lJr
zuff0RAgR1_{EOss%Pe$G=C7TYny-`)?87K?r7D;5ukO>71>F67bte5D9k27pyGSOT
zT=kc_NQ0R?$NB}GeV4k>{`U#UcmE4D&l&J<pp|V~7*?KHD#$x|kSdsL_Vl#2foo0u
z8`L>U%M^eq5atyykDxe=!SxeBjuyQ21TwqeS3CfgIl)toAS)5P8V%72ZgJtHRPd8J
z0IK&4h6{fVB783bv<_{dSa9(r`i=-6MH?&l@lEud5&j5mv*5|t8I%bwsm0<2@5N$J
z9^nmWqr%+v#%aTenusE`ql$FauP*qYQoIuvPzA+C>AC1vs1%_7fIs~d$;wzqKU0K9
W)caMX1_2uIU}$8!jz0+0!-9XKcH-gy

diff --git a/mozilla/modules/oji/src/nsJVMManager.cpp b/mozilla/modules/oji/src/nsJVMManager.cpp
index e1b6e230c34..8eb3bfaded1 100644
--- a/mozilla/modules/oji/src/nsJVMManager.cpp
+++ b/mozilla/modules/oji/src/nsJVMManager.cpp
@@ -24,7 +24,9 @@
 //#include "npglue.h"
 #include "prefapi.h"
 #include "np.h"
+#ifndef XP_MAC
 #include "primpl.h"
+#endif
 #include "prio.h"
 #include "prmem.h"
 #include "prthread.h"
diff --git a/mozilla/modules/plugin/base/macbuild/plugin.mcp b/mozilla/modules/plugin/base/macbuild/plugin.mcp
index cad7ab31500cf3adfcbcbdffddb9cfbc7daa7f92..c5ce6332d751246c63f60ca51dbec5079a369ced 100644
GIT binary patch
delta 538
zcmbRGj(zGo_6?lE{CovDrRkY@0Y#~4nH72&n<a$B87G^I2v4>Z=a@VpjAQcq4A#lf
zzPyujy?7=Uh`4M%P{GbPF@SAylZcTxF9QfLGN2hUSwdKCvVoYvWG(k3FwMTgdb6(h
zSADR6<BFpb12`s!dz=LtvsuM+1{?c5)l&=%OyQdk`~PE}EK#vyazl{JWVV&Yn|FkW
zh_T;&x$FP`30j*SH~nIqd^SfMD6ocsK`|95@RJefMwZPl^4uAPnZpaf&Vdn(sy8P(
zDsnJ0Fw_Cv$TFF)R$+5@!9%v`Ir5C6oAc)}GXnj>&pa`}X0yX4ZiqqmYB<?9*R=4k
z0SQj#&3}8jSvMQ7GBUzcfPzCC=&D<cn-!+na7@pWXA}k+<!HY7#5HB6&GF}fN&_~1
z0S3^y$$sb9n&;f!KIb-Lw>VShr|FuX8TBPM1D(QN01Rx#kEeuyewK&0w*TMs!q1HR
z855=(eqoGba&MVF@e8AvRCzW~xdcS{GoVM9bRo)v4@^G@lxGq<H2o$>ee<*FmS2IU
zHzQ2Hdl0DH6r#McYkK2Xpy^7}9ltS(GwMx`{Kn|c7%+X|H=r5wBB$^C#^}a$b^Ub4
H?~Eb<0iL>}

delta 570
zcmbRGj(zGo_6?lE{DQuT$pJ;FX_*!ADXB@Nn<a$B87BsCOx70>p6n%(#W{zafnhEK
zD+A-^z?m$Jlbb}0#CaJ&fRTY4u2nAssCBZ0u-aq;F$0dM0EmLg31Uf;)7|AJ|6T67
zSy%k4J`2#S1(W66(<WEuTQf3G-kUEm`DwoUWJ587$xbVdObp=Mtl~L?js0R}1p`Bv
z{N}^{|CoUi-#70F5fKB52L1m(eeY(*^}iS=pUn{m2{14)aRUW@GESZl#<KZEo;#xr
z%ayJ-2iO$dn3T5NZ)0NQVY&Rr;Wd*Ij|dR+fCLm+l(zi_ax@?UOgsua%nS^5Kp(M8
z=BriM++FaHZDPQh$p?d1Y;LLGXWs0vi5p`6y&6vTi2+kLKX2v%s>lJ-oXng5^l-Dn
zlyFRbpP>zO?JdU53e#*jCQnKe-kd+r(VUTE^29U|Ad{JK^M<R+Oq*`3W}57Gj;(pl
z?d@}JGj@wJb$y<$`I%8)awpIk>;=I1VElMW2<SU`a8NQ#_&>eyGvj{7jOm777~`0N
z4@{r<g;7juUL;Vt1Vs5WpeLAgA<8Snrym5$GkK^@zX?*`Qa#=BE70`)2-EK#1S&U$
yD6c#=z40s1bgk)*-x$Ri&8A0wV{~T>o4)WH(2T3=r|<m6=*D#I_;kkaj3NMJal<|U

diff --git a/mozilla/modules/plugin/macbuild/plugin.mcp b/mozilla/modules/plugin/macbuild/plugin.mcp
index cad7ab31500cf3adfcbcbdffddb9cfbc7daa7f92..c5ce6332d751246c63f60ca51dbec5079a369ced 100644
GIT binary patch
delta 538
zcmbRGj(zGo_6?lE{CovDrRkY@0Y#~4nH72&n<a$B87G^I2v4>Z=a@VpjAQcq4A#lf
zzPyujy?7=Uh`4M%P{GbPF@SAylZcTxF9QfLGN2hUSwdKCvVoYvWG(k3FwMTgdb6(h
zSADR6<BFpb12`s!dz=LtvsuM+1{?c5)l&=%OyQdk`~PE}EK#vyazl{JWVV&Yn|FkW
zh_T;&x$FP`30j*SH~nIqd^SfMD6ocsK`|95@RJefMwZPl^4uAPnZpaf&Vdn(sy8P(
zDsnJ0Fw_Cv$TFF)R$+5@!9%v`Ir5C6oAc)}GXnj>&pa`}X0yX4ZiqqmYB<?9*R=4k
z0SQj#&3}8jSvMQ7GBUzcfPzCC=&D<cn-!+na7@pWXA}k+<!HY7#5HB6&GF}fN&_~1
z0S3^y$$sb9n&;f!KIb-Lw>VShr|FuX8TBPM1D(QN01Rx#kEeuyewK&0w*TMs!q1HR
z855=(eqoGba&MVF@e8AvRCzW~xdcS{GoVM9bRo)v4@^G@lxGq<H2o$>ee<*FmS2IU
zHzQ2Hdl0DH6r#McYkK2Xpy^7}9ltS(GwMx`{Kn|c7%+X|H=r5wBB$^C#^}a$b^Ub4
H?~Eb<0iL>}

delta 570
zcmbRGj(zGo_6?lE{DQuT$pJ;FX_*!ADXB@Nn<a$B87BsCOx70>p6n%(#W{zafnhEK
zD+A-^z?m$Jlbb}0#CaJ&fRTY4u2nAssCBZ0u-aq;F$0dM0EmLg31Uf;)7|AJ|6T67
zSy%k4J`2#S1(W66(<WEuTQf3G-kUEm`DwoUWJ587$xbVdObp=Mtl~L?js0R}1p`Bv
z{N}^{|CoUi-#70F5fKB52L1m(eeY(*^}iS=pUn{m2{14)aRUW@GESZl#<KZEo;#xr
z%ayJ-2iO$dn3T5NZ)0NQVY&Rr;Wd*Ij|dR+fCLm+l(zi_ax@?UOgsua%nS^5Kp(M8
z=BriM++FaHZDPQh$p?d1Y;LLGXWs0vi5p`6y&6vTi2+kLKX2v%s>lJ-oXng5^l-Dn
zlyFRbpP>zO?JdU53e#*jCQnKe-kd+r(VUTE^29U|Ad{JK^M<R+Oq*`3W}57Gj;(pl
z?d@}JGj@wJb$y<$`I%8)awpIk>;=I1VElMW2<SU`a8NQ#_&>eyGvj{7jOm777~`0N
z4@{r<g;7juUL;Vt1Vs5WpeLAgA<8Snrym5$GkK^@zX?*`Qa#=BE70`)2-EK#1S&U$
yD6c#=z40s1bgk)*-x$Ri&8A0wV{~T>o4)WH(2T3=r|<m6=*D#I_;kkaj3NMJal<|U