From 710a5ed2a5ca02260511fab2e913fc04882bfeb0 Mon Sep 17 00:00:00 2001 From: sfraser Date: Thu, 28 May 1998 19:04:58 +0000 Subject: [PATCH] Changes for the new build system; unify prefix files. git-svn-id: svn://10.0.0.236/trunk@2532 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/dbm/macbuild/DBM.Prefix | 21 +++++++- mozilla/dbm/macbuild/DBMConfig.h | 49 ++++++------------ mozilla/dbm/macbuild/DBMDebug.Prefix | 23 ++++++-- mozilla/dbm/macbuild/DBMPPC.mcp | Bin 35426 -> 80218 bytes .../security/freenav/macbuild/NoSecurity.mcp | Bin 57068 -> 51336 bytes .../freenav/macbuild/SecurityConfig.h | 3 ++ mozilla/xpcom/macbuild/xpcomConfig.h | 2 + 7 files changed, 62 insertions(+), 36 deletions(-) diff --git a/mozilla/dbm/macbuild/DBM.Prefix b/mozilla/dbm/macbuild/DBM.Prefix index 92959fce622..2f6b68e03d3 100644 --- a/mozilla/dbm/macbuild/DBM.Prefix +++ b/mozilla/dbm/macbuild/DBM.Prefix @@ -1,3 +1,21 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- + * + * The contents of this file are subject to the Netscape Public License + * Version 1.0 (the "NPL"); you may not use this file except in + * compliance with the NPL. You may obtain a copy of the NPL at + * http://www.mozilla.org/NPL/ + * + * Software distributed under the NPL is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL + * for the specific language governing rights and limitations under the + * NPL. + * + * The Initial Developer of this code under the NPL is Netscape + * Communications Corporation. Portions created by Netscape are + * Copyright (C) 1998 Netscape Communications Corporation. All Rights + * Reserved. + */ + // // DBM.Prefix // @@ -6,4 +24,5 @@ // -#include "DBMConfig.h" \ No newline at end of file +#include "MacPrefix.h" +#include "DBMConfig.h" diff --git a/mozilla/dbm/macbuild/DBMConfig.h b/mozilla/dbm/macbuild/DBMConfig.h index ec6e8988bcc..69d681812b1 100644 --- a/mozilla/dbm/macbuild/DBMConfig.h +++ b/mozilla/dbm/macbuild/DBMConfig.h @@ -1,34 +1,19 @@ -/* - * CONFIDENTIAL AND PROPRIETARY SOURCE CODE OF - * NETSCAPE COMMUNICATIONS CORPORATION - * Copyright © 1996, 1997 Netscape Communications Corporation. All Rights - * Reserved. Use of this Source Code is subject to the terms of the - * applicable license agreement from Netscape Communications Corporation. - * The copyright notice(s) in this Source Code does not indicate actual or - * intended publication of this Source Code. +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- + * + * The contents of this file are subject to the Netscape Public License + * Version 1.0 (the "NPL"); you may not use this file except in + * compliance with the NPL. You may obtain a copy of the NPL at + * http://www.mozilla.org/NPL/ + * + * Software distributed under the NPL is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL + * for the specific language governing rights and limitations under the + * NPL. + * + * The Initial Developer of this code under the NPL is Netscape + * Communications Corporation. Portions created by Netscape are + * Copyright (C) 1998 Netscape Communications Corporation. All Rights + * Reserved. */ -// we have to do this here because ConditionalMacros.h will be included from -// within OpenTptInternet.h and will stupidly define these to 1 if they -// have not been previously defined. The new PowerPlant (CWPro1) requires that -// this be set to 0. (pinkerton) -#define OLDROUTINENAMES 0 -#ifndef OLDROUTINELOCATIONS - #define OLDROUTINELOCATIONS 0 -#endif - -#define XP_MAC 1 -#define _PR_NO_PREEMPT 1 -#define _NO_FAST_STRING_INLINES_ 1 -#define NSPR20 1 - -// OpenTransport.h has changed to not include the error messages we need from -// it unless this is defined. Why? dunnno...(pinkerton) -#define OTUNIXERRORS 1 - -#include "IDE_Options.h" - -/* Make sure that "macintosh" is defined. */ -#ifndef macintosh -#define macintosh 1 -#endif +/* Nothing to do here. If you need DBM-specific defines, put them here */ diff --git a/mozilla/dbm/macbuild/DBMDebug.Prefix b/mozilla/dbm/macbuild/DBMDebug.Prefix index b6db0d66f0f..a3bd75f0a85 100644 --- a/mozilla/dbm/macbuild/DBMDebug.Prefix +++ b/mozilla/dbm/macbuild/DBMDebug.Prefix @@ -1,3 +1,21 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- + * + * The contents of this file are subject to the Netscape Public License + * Version 1.0 (the "NPL"); you may not use this file except in + * compliance with the NPL. You may obtain a copy of the NPL at + * http://www.mozilla.org/NPL/ + * + * Software distributed under the NPL is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL + * for the specific language governing rights and limitations under the + * NPL. + * + * The Initial Developer of this code under the NPL is Netscape + * Communications Corporation. Portions created by Netscape are + * Copyright (C) 1998 Netscape Communications Corporation. All Rights + * Reserved. + */ + // // DBMDebug.Prefix // @@ -5,7 +23,6 @@ // // +#include "MacPrefix_debug.h" +#include "DBMConfig.h" -#define DEBUG 1 -#define DEVELOPER_DEBUG 1 -#include "DBMConfig.h" \ No newline at end of file diff --git a/mozilla/dbm/macbuild/DBMPPC.mcp b/mozilla/dbm/macbuild/DBMPPC.mcp index bcba1d8fadc00b34610d46638bbe6d021725178f..610683f33129c94665da1dfd225cfa2efad63a8c 100644 GIT binary patch literal 80218 zcmeHQ3z!^5wXU9hXY<%>vg83Ilkf;6un8gZ7(h1JO+sKdyU7NE_(*1VC)rJQcb1t+ zAUq@ydA~sf1OyQU6x1jJqC5pe9s+`XUh#RkD&qHDy>j*Xed?F{|5ep9-96nsJ;^3) zGJTR$=k%%5)m7)5s;=#+>h4Y^`-Ko?LKue$qwyYL%za6Sn(HB3XG9DT1;4$@CU%}0iOcC2>c-swiGV|Uje=f z{1Naq;OoFQfIkL4349ZH1Mo)RO~B6puL05zHv>NlyajkQ@H*hFz}tYI1Ktk219&I! z^T4}+cLTowya#wK@Qc7L!1I9T11|t>0-g)J5co;pML;_B9N<>qHsGg#7Xv>HyaaeD z@G{`#z$<`P0yhJ%0zLrz3h=AI2Z3J#-Vb~T_%-0yf%gLM1AYUz9r#V)w}1}=zYTl@ z_$cr(;CFzJ1HTOXE|9@k4y*uH0ttv)Q3b39)&NHVYk{MIV}KFhSm1PE6gUGo6F43? z5!e9S4|ou;4mbgLFz_(o;lSCzIlx1JhXQ8-Cjln|rvRq{_Xi#TJP=q9oCaJ5JQa8v zuobu%cnYu$xE$CHYymC>b^uoZR{}eMtAM8i&j79lo(cR2@GRgG;75T+0p|mc1}*>| z37iM~5bzk_vA`pMbAiVJj|awpCjd_bo&@|b@MK^Ua3OFJuo2h{j03xX-M}8;$AN2s z3E(>5df>-^Yk*r7u`d);9t)>(92* zezXtmN?S7)XcxALcA$N%cB4&b8~Tbiqi^Ul+KxV=-)P%*ApJ<&nl`KjPoL4Rv=@QC zWSkkm(ZDglu|T%94mciI51a`s12SHszz!f|h_T0*WGpfE7=z`&3LxW@@y1wX%rOob zX9ocf1|9-reAWPG15F=Sfv*J40Ge@I4Sr{UvAGsidRcWh#Ofn&4>rZNSVBO5Or*!2-WQSfg)nNEL61{E&K^836X7C_5LBeMla25CF~;<%WR_ zgw;hmAj(fwK9q!1^wDI0aR9H%^Ypn@xRm@a>r!SYV7(NOVZ|8aW)Ehm?2YUh?4=x? zIEwg<6y}HkwSd49S*dX?i`rTeU7OZ7cBB&P`p#|a%_|^VTa|-0WL3b`v?WsO6Vdif znXI%Z=48Oaj*eDoweptMrDt|;?Casoadl@$v%JSeP*09^e(=FrQh6y#7XqgN4PXRV z1}q0w04sr2z-nNF^m(>5Wf7V*XH;fLBb!qH_N#dHibZ<_+KT06fFDf!ja3a+u{7%R zj%AHQGXB{3d{D;m@3$<yc#Z~yXMr3Q z2pktxUl!sW@Ej!we+P120Whe``31n>TtLsM49;mdHUf-Ok#ODtFnW-1{sAz~N5ats zVBCy^^A3RV5E9Nc0LF7jINtymzeK|J0}R$d4%RRS>&1BqATkRH=O%y%=O3KY03w`A z>3$wz9XRg+L|6yb8xXk>3Fl6L$k&lX$$@_!$qdPg$ZtSrYW{Da2PwXcb~;$|ybk9= zfU={J94c8+#yK482Po@9a+qXA*~OrTYyNi7*_z)DN*@EtUPN+)WJTG3f*z^(a{9SZ z^StI<&7T4~PxHLiQJTL3biU^A2W9;L<*y)FAX!oV9_WV@Ur_^kjOJOFV>RCfN*@C% z)+6CO7Eo~+63$Nn6%QggL9(LaHBkBkQ1MqJCrMURGA=l$22}EzoJ#{LJCQVz13!pl zp=3qnHK2<$&p2t;{HvfXntva3vEr*37fUqH>o3)O7btB6sJax%GRcan2S6FGfU1{~ zoF-XO#X7etzIp;E+YhK_of%tz>a&p0$AIdKkaS2^RNn!*Li107uGIV=K-o?}%@`!B zBr9r;20dN#q-SXU0#NpCK+T;<&XlaE`7Y>3G|xW5dH_Z-`6v_cjMI-vR*YghKCbyB z=qEIP9q1a(e-m`A=HCR3YyN#u+73`#kEC0&qLwkjeg&vyI}(x=wQ10Gn!g#8u>z=l z6iKgSMeQ4)eVYFt&<%&Agz ztNBAf8AE_N_UY>-E9w}-Y!9H0{=8ALqHZhbO`884=w~$lHBiP1pzixfXm>!}+emJa ztf*rg-m3WVWuUidehMhd0*qgPuYum9`QL$lQS<)eqmB`~}o+M#Ad>>S^Pz zNLJMInqSrYcR?T2JnQg~=Kl+n_5#%Z3(40dD<(_?{f6cb2Hmdt7%2NTU;_Q}Ey;=r z>_ZQ0o-y)m&C_O&XrA;@&A$ZtnC9OG{f_4U0!n)UCRQS0y#W&sK=M7wiiyX8KB4*L zpigQ(4*Hbl&jEc}^Nhh~G*4eWt9iDM@d23l10>H$R!saE=<}L?5A+4i?*OG9pn>*z zQL>_82Ivnp&zND`01d53UY4wA;F$M{=FbIvRr6PZ{z&um7kvY0pp9RbtY~-|^bO7b z7?cQTVEnu(S<&zh(6p{a!ng7Wk>3lCo<{o_)sF++Siqer}`3UT*_3Pu1`6@a!N%_`%tED zpzpjy4>V=rXu=F?f<`r+ZaJg8LjIL%YNH8K8+4{FKWfn~t6MlU)SsB!p6N}bSSwb@ zY|Au#!ldjI1kSQ6;*H6j{TmjAi|pUA!q|G|)0FHQu)J&uryJKBHF6%D6~TvFEeB+) z)L&DE=!^Hmw2s_hhilTAxOtNec7|PRO(u~NeS`7L&Rt&q-4x0G^<*zQ|A?cP1K1T{ z8~o#caU^Zh1n1+gIcAuUJph9s5{&`$cn_N!K(8En^8)BqK<}skdTizV0D4u>J34?K zqFpQqpw|GsM{0MB(hI+|n6o6?!&K=ic4mUEJ+p0v>7h27nWbUNA*&-7+xtKxW&n~8QN zGMT=?^;z+fzWzkCEj~146)xJ;*WVLed~PNc&nh<0ZJskH+MFC1!Wk*^N=k|q0fW}_ zQ8j4xB$g%yO+|`Y`qJ@qIx)~?DS-0UzQK*TA}Q%uyu^Ba0Ys>rmF#Qm4TwcCk6dE@saab z-x;zlD)!iQQLqKEOFo@r#->NM&DS0}+UXv-rU6~D9lgm@BkM^w4HZf*IkuQ`$j^5jcP8^H{(i#weqD-%6zEk{@#Zu*aZ7!_sN& zIr%-tp6}6J>`JbE#Z|?xl6k$vQG#n1$=C5Vw5@aGpXlR*{BB`CJ-<)b^IbXw=4xuu zOuDz<_0IxJuB{u`PjvPGd#*kB?RmDiw`W;HK0n76?fKc-{`ncEeeF4p@OI1028|;# zI}^8<$`;Rd{rph2=R2d=HP@pq*4TBN=M3BYY*&k!!J4n`Zbw^)+E21Yr#;I(FdMyM zQe`;9QAu4QQDx)>p%OdePe~o2mlHapE|-%tUruJRkrL*InN@D}s+MPiOC3AoN=aQq zN@cl3lPx3vl8zYC+AiUf%W*c{5;QrbJX<(JMX5TYL`mHP1SK>k^QOfJEtTO65G8d9 z5S5V^AWG~E5G8d4NKWVskX%mAN;#RuC`y4NF?Ms$ePs31TJ&dUa)^u%JM>d^^r@EzZO;_LgjfpK3u35Kfuv;?y$@TLkGlZw4Un^dtwBN` zwO13HU?RhdC36BOL73G^#Rt>$5*9O96iq4B zY&8;Xovmx~E)5|b%|Y2(9~9?!UMFI)SPy>gh;{e(Ayh2hj7fLKv_B=)4vpnJ8tcuu z6ukB+IPFw$+N&{}dvIj;Pt40fu{NiNVit?XY!*hT7Eg(ozJy5`^|63b2%!Z+3lwhwtVQ8!7OwCp z1C|3TfR#XO3li192H+&%OyB{)C~yXFI*`j(2w){}c@dXN5x6wST=&9dJzVlcm;>ap zCIXj`nhUg+fam#yQ-NH9L|6f=k(^qxK1%avgVt*P0?^T#-v&BH^Ou8;)%;DM<227@ z!*!a!A9TFtw}aMep37e+Xr9Ycxzv=vC8KN`;itg;Bqzi#LAlI{@H^mS$qDfnP%g_M z{1eEfHvog}I?X`|-P1f8pSF6m@D0TB+~JRcyJFV5HeC7?%Z{yNYFn!gS7Lz=%2^cc-Q z270XK-vB*M^Y4HjulYZN#x(zL&=VA2#@IPg^DOTq&9{PnSo3Q@Pu4t_H8*MgYEb$K zP)@+Ksw zkpq7^64n(^z5z*_WJNjq#d6KFp6!~a4e1*|`2$E+NLG|T3A$4A&w+L-egvoJMfQDYy97&9K4_zW>fJT!;y--q0v*Az=Uj0+YIbLNB*k!QwzMqr7D zIu#FcOIYWoA^spAQ+I@PO!RF|q|)*JHCaJAcKTqRaGxi_)CUbRLo^}dbRJ~)}XMyp#^rq0{HFQvOth8 zE8xP)5(4=frtO(@k6i9qLMABnrt+SUT`89}hLmQHLS||!X z;i`oo9m|?m%^K;I9?tsN);bMm!C_e?V*&ezH}=_;ti5=NAHN>c>u{`NRuisdb=YUP z4@bld$hwl%I)<8eRmjHiEq2ZQe9L3HaYLN@8*FgavW{rm>a*1P^|J8EiOo3SK?z!b zy9RQzV?H@4F(b$)CuelVM0Rg-i5VbluAEIE8KHY4+_ppP3oqjjpJ=#sy)u`NMyk(9 zB0{ax9=DTAPsYtWA(XTQT9&k~8ZTeafw!CBt?@(sc$G)q)ZgDkyLh^P;bHE`x4^u4 z^B6}XzoNUjhS)8Nzq1|BS9bF?!{S2=gcb-buxl2;Pl46u(~K_nqDIJ1fyL}(4}Un! zx-$IXFl&mC2`#X57T5yFUF|H5B)gc4uGQ}FAK(5rx6!LK_)uM&FmIiGKmuQISr?6U{ZyFTCfL_6`JMIN~e4SRouTP>Kd<9#l6$)O?kb6b6w1{$i3kqCL;#}Wyd@HLnrJbE?tQ;p6s!tvCWjO_EgK{iy zfOlNPTAv|&`_%`6m(%UrvO?|JiaMxvb@%#3V(@Z?Hu*G*ugmwfPqsb<#$LW#zYxfF z`C1w8`c&`d_brMq@Ap+eX5I__T~6ppcKh1K<&-?pT1ZlOds|*ckph;JTNvYgvg11i zu8Mp=lxv1X7^EDkH^NAk(~4$0aE7|$^7|+r+XWBY%kQ{on!90&yyJS8Gfa2f_C=>g z-D{eYwsovFXA++E>1a(BjIdmZ?%Z04hjj+f919tCB~2|AM~ zR8GK|ghw%3v-Jr$lPFkD(3ymLLD~8Y+e{*{9!=aO*vn@C?uLd%ikty>mP6wX#|%K0 zvy0QDwJ1c*B;=>;S!6y`jkKA>h`hrMLl4|VXG+hlMH*zzoA2g)33p<6O)sVP#E}*m z&Fxoj%x{NXf_o_&W*0h+n)}lQ{-%<1je_Nzx*@f$5$Gtss6*aM+lFbbIwE^cZ)RXu z9_eN08XNq*8pQ8%&N8q|?vlQhzV(si1nYtR zb^{J8ro5D|((5xj7T(rSg0fK~|Dk=GBPz#mxt08qfSYHDcz6G|_Lc}sYOyTQ> z%uiFOj|Ah3WcY@3_^Fc8i3&?Rgr6!Y9k+Y7)DjQjr%F7nR5}@EJT!%$Dk&YO`?S;& z58}W{V9ZHC$H!F?%`Ui8SX0z_Z4}?Vs-}L z8HMIdE8t9`P&s>gCgD+^;%5>b1;Mbz%_Ity6YeYWid8j}2=^6v?Po1=2H+itaKLcP z0O-fYUEGSY7G;F{ifBnM2)uK480PZ3=uFv!wMfH#MPA;d9QWjc>+y?NCGU4B5$-Dr zFgM(@tM+~UCGUaZz9LT>^^CB$hOnXmcM*8D$;@#3h?SW~8f4s{9?A*#710oRpe^XT z4fm2y9_-FGUF$FUqSf30!yq1W!FM+Pww3c-&f$}8G7Oa`trEve$Vhbs9xSu zZyE}+QB}6?mB_$a@Bgc*Be5 z{&!wK$X~BPzK1!if4%P65z5y-vR%V4*C=9S@vKi1{1v{hpuqbIs^t3$7}{3A&(zk# zlH)5xS%v(mKAB8*xwrmg4eq(SQEKqQy8MXf;Fk#HzukDry`kudvzpsm7SD>#YFW5y zAxOuv=2f%yhKdhY9r0?35JC&=6Band<$V~-w%-tWc*l-kpRiA~FlWQ^9D4Ht=v6@Pr~rDE(3>AX4=ZNH(E;@MrjP{z z^ctXdJoNy0e?-<~JkB1#c$07()8$PN2F;WOtKI>So}i1t{$fwPY0x`Sm)GEQf;46mc3e9$gG7Ufjya?0M# z<(>S#5aqfYtGxVv3=g^-t9&ZTsSpF1AzoMY3Rzgqa*(Z%^GhWb`RIS)I69C?JM^nj zzNmwKpI!gtZ{fIUAk)t!)0T27(JpZq+68@UeJVRJtQ|2hly=B}i}qKx4rJEjx>o(_ z3v%Uv%fh5PaJi;bP=+t<{CpRCFm_dD?C0Rc7i+bE@f_etQ-rxfx9NX9Dtla2(>xB*Q51(Fw({;hul ze<7vNr(a@9f5{N|Pf`l`A|$H*Q@;E<_=_kNV*OIY)z4Kqf4mujt(2lF)kw7drkBBQ zqZD$!L$XWhU&gXOMJZI5BRNjVw^DvFr9#xUA{nFVQ}rhJPg4pxV|${~|NDdBFQF9j z0VLWEKV`qWlv2D><{l)^DgA$Pj&K>JLiEi*{r6MyUr`6~P1tZOlKYkXKHBCAO5t+$ zokl62I+b;~l2Yiy*Ad;`_rCzaRZ=Ya{{(r9(w_xhT&?7zSuY(wPkaabHA?=_e!2MB z!txOxgcRaS$Iq09kAmPjDHhNFJ{Lc~>VxchC9h?i>-f3nF7P)f`P9#V>iAi~vFS!7 zAAL8dvfI=#e1dk9k|*ba>iDTT6g)pEdIM4iA<_1Hm%g}-Qgjc-k&d5tSAhQuM zA-h+}tJzOg{21+sVey2L|Kag${D_~Q4H>VEDl$%W{1``atawVvE8!nK{uuS_n@>x* zsD2kz#gBL=3jP@-ucbXy{1|f>!_O*t^?!pZyBRA^1pj>{uYCkm#g8$Ked{?TZ%Koy z_%YIFfPY@e7atF*;>RdsnJ;KL^;JBG_g(_eSOF})C>uY<Yu_v{D$ zhgzNhRqs1x3S;K9Z2XA#7$YnTqJtJ7Rqdv9Gc<)-(Z^M2=d z&$;K^_f9YVX_`GEg_GHAnuuf~)UY|GHTd?(6&HEnjXWIuasyBAI*k_;_TG*=u5q7}h`)(06M^2w$jS}z4*2_44*26R#)}uOfckBV0TxMt+0ElPr`12-CISbVfR&^U{_qQ2f4eY zU2#JTX_^OGSkt`FT7>3ogw{5<^KdxI+BHHLa2K>EKOVfFm83;lKBB66MzG?>g>FX~ z{vh%lMj7rhML;q?>0i<>xa-!(*Fq|WG#k=l$T~wxhLjCy(j<2TI+x6Cbr~kNAw7ol z8ZyjJ20H5zD`EitRjVrJyI2$6tU7g>QCQ^+S{nYje6=|TO5 zEA3b#$=J~FaB(z_GcG({zyX$&q4qK4G@`lIFCzZo!_R;Z2j{#Z*RIck@$NR<4YvSj$yulWx0+|?T6kX zP@=*ssJL;^V^IM3I}>A4+{A$4{{{eI6Y(wL?=>I{%;r7~y%iI~A`Yfyz^v*4=xqW; z#YKhcHNN%QKIn@uF`m1G<*e?R diff --git a/mozilla/modules/security/freenav/macbuild/NoSecurity.mcp b/mozilla/modules/security/freenav/macbuild/NoSecurity.mcp index 185b6b421e368ece8dd5e78466fe38469125499e..0259426716f343cf143f2ce38becb3306cbabf48 100644 GIT binary patch literal 51336 zcmeHQ4R{w6stPty`e9r6r`LPz;D^(;o^+8=68ZD$O=o+Jz(=HydaH zr6`~RB7gpZPy_`;MHCegq%DF7sQk*0ik1JX_wiAmtM~CfSGn(d&Ns6&vu9>ErSz6$ zzC7>wzB%WcGv|Eg`(|cm&YW~+v)z_uB`hm8)3Ua`X<0k!EURi0@|MKnF)&Td*{<}O zR4$jv=8|o>?3wA#yj?V0cs)9L1aLUe0L%jB0CRzPz>xrKXw3%Z14jWz0}Fs-fcFB8 zz_Gw_!25vXfy03J1J44#2A%_+2c86;0bT%J1bzcN0Xz--7Wf_T67YLqC-4X0W#ARy zRp2$?b>J!B4d8y@C%^;1HsD9VeZY2L2k;w!*SE$~603rGWJ02_dfKn6GyI18Xp_5i)WX+Rb@ z8#o6T05$<10qBIAfpdZLfIgrfI3M^Z@G;;5U<+^|@NwW1z(v5tz$HKq_$2T(;OoGx zz-_=yz%9V-z&C(9fUUsIz&C+!0pAAh1ik~@1$-Cy9&k7Cec%VcSAib_R{);{J_B3{ zd>XhMxC*!$xCZzXa2aqd@Hyb~z!!io0$&2Y3|t3X4}1l<0k{;n5ts@r1(pFzfD?d) zz+zxIa3XLL&;&FCEkG-<0$2&O0Ve~ifOcRta0+lLun1TK#DEH*5~u=5319?J4b%W5 zfl)v$FdB#hV}K+u4R{Z55Ksr~155xW0tW+Qf$_j0z;xhHU>fOI%O`;cfe+KEKF+V*0c&|ai&fOaGG0kj|K9DsHt(I;q6 z5`BSoCEW_pzN8-lY!hh*Ks%D20cdB^O8{*}`U^lill~2G96&MF$MFEg=uaFMP;4#| zjsYmvgoI-OiZPZsCZJd^5{?Zh_6Z~$BT(#0BpfSHY%3Dl3lzH>iHuw9QOGI#X6xfB`$=kG2R77ilzj?J?OoVR#5A!MNKU~RW~go;9eGOI^7=kiucP1*^nR+# zi1nC#?egg84MbRFsy;iAHJ%Q({-fYU1ZP+e(OS z@ov*LHLdB~hIDe}uJ**~1&v;@xMkVe&a*OI{LQ$gy{*}M#!SRHG_KJ>bJSolSEIgrcbH@D{p*7sXWGr9hJ zvOT?_C*7O3JY{Y0iAH}8M!*7+%X|8=xqOm3t!t9aM>Nl#ZEv)t`a4tIYHL;cTnj1- z`+Kal%`2BKb??@;#Ixx+P<^L$V(RRaoyVi}rq1qXi&50*E~{sY`qQ0k4$4-vx2>Aj zfF0EEvdrm%(p=Hrp6^07G+1aKL22_aE3!pdjfFh!0+r6G4|Ab(IeSN>dN%z8#}u*7))0^ zJWQk8fCYOs8XMT?m{ILo+{Dl$>kEPF_)b3>aj{t0o@^iJ<8U>iavjc%Vgj4fc>-GI z>t)fgq`^gA;O>Ldp2Engtor_q-LRA~w~#4XzJ{3hqEf)16dlaYP#)}QkL@AeOm@-P z$96B>gR;%JM@~!8K_Ux87T8-XfEyIt23SeCx2yKw}QyMDUVHzh=m&lBc~-hm-{{7o~jl%6_xltdPYED%{hTY%@k**G6L=O+A8 zqdW)C;HKeK&2y2VhOGq-hjaM-qJe(#)>}{gdDvQIxOW_HD)diR{t|D=^q!T@4R@17 z{U2TyC_DghJ%+IG3{~FD4tZ(=$>Q@OYCif$0c3Q&#V4W}B)*t&I@-b_A|>c)$t0Oi1J_Crm63)CoGux?#Go$JZ; zrt*V6JmysJ*Nu-7?Ms?{S;K3y(uz$mU%(tYw5~kuH1+h{$=O3f%=I=nj=6q(!OFj3 zP7`J{uUx!jMsmjDg{v2WwJmR6&52FJh755$Z2BH`boW?*Pv(83FL6k5u|sN})icVO z)l}1!>RvKU-ixN(3tlbJ#Bag{CTf<+JGCVcX&o`_$1!wX~#R@S$jp5c-k@6cN?&t zR}=kW^lZejNc3#PF-0Uq7I=p&uy@=g$oxk3aaX^P@|L1gp={AWrn@V-WK%wu^6#dvL z$Mp^6#m;X~^1FYqN?0S^Az-S(9|Qq95(WXK41}N}2?cX;As7tho^UXf8v=s8HGdvn zbl)DL>Isk#J%6BtsCok?M9~vCA$qO=DxqZuQVBIrK$Xz711m($7hokd9Ul(U)BzWw z;R(DDz2X22QT7L7Y1MK%!&=H18mg5$G}M(q4QnH`7_g;OByhvk3IQCV=LzHxy|Mzj zj6nAO1TQ{d(T{M0N~wVL{t!1*5E`KBS7z|&tKt%)u5^L}(f=sG&_W%eA--z=CN=C^ zBG3%KOAVEj4lMh}Ygi*$afm5dT*{Qx2@D+dP{bTCx+pMESR580-scx=g!kHIe1cJ= zm7Kk}jF_NSsp}e4%DALKt5k6CV5Kf(P+^D!j~pwZMv1|*)dI)QRtSz2YLvcSIZ7eU zsA>wlN}+}lal`$~x;8fC2vp}RXj0e)NqGXpn_){1GQur1Iz7kGAj7O zDMZKdOtX&hH}ll){_qjw5p|{xAyE3NybQM1ebpjt%xMgpjcc zPXrk?LIbE&?CA11G#EC96he)9;AUX;PMI%!vDz>{W3k(N$vB9;Z z*dGKsJHY>SVVLV{jbN|$ln1uT?CY{`u$vbY0_<4q+=X3&>>J?HddC27)`bQ~eurLY zN7Y6a2(p0vIS1E}w&x4H7qY#W(;CS3TvRT?1xz02wwgU;* zs0PJ$BH^0TAoWi&WNqnq5*ZVii~Qq}a1Crw{B$I;etP_4khw-RD1IFhSwB5~KV(@y zJ^lh@SwB7gH^{PndV=ke_0toFLzeZ^6DL8YO+kq)60XG!N?eE}NeS{-kW5pemADuD zAd!Cyez3^@1V2Q}73}MDk&ggBROD6Q@`+pp$7rVHUkff@=~vthnd@|eDxO3#TZvZ1 zU%|PCH>i?*VIM%1%&S+TRk;kD#{*S%BH@^UDlbAZSBX~TR`7WMsPX|MM=H^(d^}wFp`Bzv_{Ye7Kwa4c(cg&gD)1D8C0e6C2~Ix)jk+C4 zmlCZ}4}wzu(^jDEE4nd=TfrNex8vPF>14^{UOa(t%Wct@R zBC}naME(N!W|4ma&SQYa&^OLgqBV9r`1vBw2mh$Z9FvcU{AutDM7|q*i^#tR=U9U3 zs*rqKiB{b_@K1y`IHi^aY=9<8#JyN$)!rP#&v>U zCNk@wzktq#xFy1wGyrI8SraF=5ekS z`D@^x6Zs+V&x`y=aM~KQ&uAoHRHC&{1NfIj=2(AOWRC51BJ=pyi~LRSuZa8@_zfce z3H(MaPZ$NhRphzgH;K&nqfJ2*ILq@jH)_~J?powhr zZA!Ezo(z7w$ZYdBL}vf)5SiyUwi`6@MI_%+qBZef;NRBrzSF_)6!|3Z?}+>n@Vi8& zy}v8+z2M&y`8VM7InciUMDl$lTKgRU{sWPZ2mhhSJRjU6GX3R8BJ=pH7qs7#NPetD zYd^-+eOjKhKREjXnsh7@#tdi@W8ncMT9fGG+eD_lw~PEB_zsb2TW*8)=XlZXp#5hc zq2GY^UykHqC0hIUf&WZo`qv{Ov%NnTnRa+o%adc^kBK}D{Be^bWd=~icMZOGtr^t7J|3PHh?`4tS1b;=# zQxf2>ihKb0Ya%ZIe_iC&;BSabpXB}#m9hZ6q*C46Pi^A;xcYvw)J{?PP__V1OmBg} z_`Q9svC&GM-8htc9Q7^C0xo~RdeQWUXdSdLdku#&IX_^1Zi7Flf7KD4FouI4*nJd# zz`E{kf3QmJBY^CbUv3oC!IU1KiQs7^>(Fl&VSEQ|K~;jw-)8I##Pen4{lW8pp-xDr zy3)BQ@C}w5nprM?s4@6M;s1mU&F)9N@>#&;5BPsV|1az0M62WY#$?EB4$akZhRpE1 z(;bQPnWkkWWnGQH|9=K0zH^vXhF%r)4x(NYpQH!;|1;EA13mTs&!9IVL~kVYj+EmD z{{J)7Hwt?5OX)!;qR0Y~1tJS*3&gF871`c&s5xS-t!=qbjWPudjP>dlhT5p4QfuMa3oF9Q+`0|0`>6p=`CbweUTAD3w*un&!o! zm6TD~0i9LttD4JD4OL-1tCy@@jeoQqN}hiS9-yh~nLRt8SY?-APk4jMuZL4Of@u)- zgjQ5`J?TxM^#r%HP@?R-v9N8DO0}mBJE?j~vS=|E0BSn4Z;%CDz0v}dLI zwZ&;q=f*HkEWe(5oG5uXW`=oRY853DcV)0nkolF$%ciPI;GKanUuiRR(#*4X$T5U2#_~Ix%T(X(6|@ZH?_=f$eE)$(Ho6 zLXBpr1KGRv4q$!giPu_`>h8{Fdy^-my92Ko`VPR{UOU%0^9EYSz9R`cexFdG^c8RQ*6U_CVM?zjU`^}Nm7qz+W#`hb^J z7E|@!b|>*}yuz&-=w033-kHnv<%=yWIqHnL8zT8_I)!RY2hwuxou%pFtT6X{N>eoV zJls~pq||=*i|$5q&xgsFhjr8C55~FY(e%JD>kZAaXzuyY9M@g#75$+}y;G0op6{v+ zhsu7g>xIlckLH#Rm9gEGe%Sud#C2-a+;fjV6y}!Vhgd$-lWr8A#LJQB-eOlQzIX5A z@`p<84{z(+6zxBoqpw)@?okhJoy#9&?s-}M5Ph2xY|?jiiOU~G;`|WJl?oWm4&+C3 zr2>qDY}#i~Z#aXe%t$?DzTqrcPnmBxOV$(mVzThYwRAn96*+G>OVzWd-*5)BXYg-0 z11hrpr?1>MoTch1^9^S}HCvqal=+6UWIg4+;WSs|v}ZTG7g2E<&6UCk7gGna%6Z>Y z&K##fz9}^iyfkrlyeW<5N)?ZHA;&d4Iq;ozYcyA?U@)K5fo*kWiRMZL%-FNlT9I=nQL3IjeJ2snp26Qq1XN`EVcB;QrRpj3P9mV1ElzvNypt$dPq}vz z=8By5?6y0JXs%Sy9Nj_Q0hk92{zKXwcL1uMw>d4Q1C>N`rD(|@+Fi4OhxJ@3YZ0bg zC#|0Tyze~4+lyM}`@VmR&E%5($d~o2?a`@Q%cc2sJ&8B%Tzt9={e;xx&aXy(OzLsx zPeMJFR!?4icgM$OLN(C0wjiIss9gD@nV;;*_p_a@{F>XaT?hS)H^256Y)|URcW1r% zHTPh9CfW~ucYA7fV#?5*p1yux{uH#cVt!A41CHy~uWc*T1IeK=KZm%jtp)#^eZhSP zL4J=enmYm9Zhu_oF}>Jr2Uq^s@1W4OgDbzT0r_@+-T6((xBKhLudPM?iiq4k-_zQL6@SP<1bhFQ|m8AhOC!ddnn{8 zt$%(OWLZ18b`#`DI{!8LoUEf?fUX!Hq49@hHj z{U_w@%!U39NE)@i`hNvGRJK+7JPWn{$s-^?sPkuh5pMIM&VQZXugZGNwOkii>rXxS z?~otT`eVj`uh;cYI1KW`I=}WW;K%6vSyLf%&0)}(J|v@c{a-&A@*~Ve{zs8a(D|EZ zK&F3y#$1I&>~I9v8fv8wqJ$}_5n2ZW+dW2_g(_|S?1#3Lo7xj z{__mST-KRx;5yveZc|5$hAeANH=F@k{O736km(1Y1x-lAfBtwWWLb;4ArD#nr;)aQ z5dbxO8;RKG{(T_J8r8>C75t}@V=C)aH!yBQfBPpP{|*4XcPA3SOr1U*8E>d; Q>-{*E?LRwd!#A1#e_z^$!Tm=8Rwu0A?Y9;Nnw!InF)L%zaK?_*GWM~$tI#DS>NB)v|57_2AvN;rEU#*d ztWAN zVBWKm7A&l@@Euw5^$v+K3)l*_f$iW-umdk|6VLVX9NRkLqpZ2wNrhyAyo|r zeJ#+nU@V6w0ZDwlyHtTcEUyn@15%JejzK3Ah^G%?2jc95&?-ukh*s&jI0J!klBEnV z*(FQ1gl~~^AcS(*e_4!?zeQY;%X8t8r2jAo-}oS#i_fdf=DzAfe2mT3Iis%b2E3ah z`&HM}PJyPy=&eR?qaG%ca-QV11)_DnQCLmmLe z?nx|nW-t(M38`(P>sx}ihVD%G3a~Z@FR#hWpv7woCsh?{zc<7z+Rm~DDY>DgMdUsO zN$+<}Sk8KTSG}+Ol2v3GEaKyWC-@nZq00kzP3ZcgxA%K~{lh-Yw^thEhF|Au6_XZY zvjUoP%g<7gu;bL#N+%-dkR&Y;{SCQl)7qoMELr||DBR?YGzI|wDDn2_fPvYhw0;GDZSfb6b4v0tB;fvrACr_14s2egbu7AMkOUF9kOB$1a!WY_~9i3 zO0DP7nGs*Ch9b1Z2sV^#8K~A&x)6c`$Ij1m57ElEoRIj=vY+{vbtMVkao|b4Z0)8s zYx6aG%_kE7L9XGwl?p#9yR|RI&$A58pWd7-n#nXsZ4%BoprjN=0q8Rh}wzAWGs6M;fZ6>kcI+e#pfXnd+_{Uu%VL-8q)8 z+f$-7?9s9k^`0XAgGTp^zx^tIb@}K-y^LCvr3_wXb8F=_JyJH*4dTbf2a*SZenfOK z4?d%A7Ky1XNhQ(Kt;*g7oNiera%@MD5x&?2LR7A%>w}obdLlhG0P{%3JZ4hGwvq4a8QtlG9hQgTP~TzaY&^RoYPh*C?xG9WaF~I<*-X_q z_%SjPjh%y!oew|8Mbrf_Z`OB4^?5q=i6ExPeIvxK`r4Svs`m|sTqcHG6VaDMaVuep z>rcqH3%vRv#)ef2e8enZM&ReZhSN&cae2cnz+*z+{~j);YlZ%(uR8&%V!$;AeWrNf z#r=@u20kBsj=&H93i%ELryX+({7t&zwi@_7=(7d>G%fy417DB+kieH6h1>=v`|gj> z;5q`&($X#Gi>sd5~!f*s(XUhqNgIQ<{k570Y-$f|! z0yM9Qd7h)FtsoTm5jaq+;|r8I_@c0tI?md@N55SdaGrsDx4@TdKtEbc^uj*K6k^bl zgGf5VN~vgQXp$|obA|=&e4x4`1c9?^%JQal{tK2 zYX#nZ61_-K#r-wpbpr391&I_@uIPb$zk!cJFH%&wBtQnpQ&7(oG-Ah;3#nizH$gph zXhe=GIpZNG2t|gSMq{Mt+cP0QNGLL_0*$c&&TWt>)j$VtPN%3!g-Y2%_B+UX@q*kv z2{P?0sKbXwuR}3I7Xlc!)Uw diff --git a/mozilla/modules/security/freenav/macbuild/SecurityConfig.h b/mozilla/modules/security/freenav/macbuild/SecurityConfig.h index fc53c59bee1..70fa7785d72 100644 --- a/mozilla/modules/security/freenav/macbuild/SecurityConfig.h +++ b/mozilla/modules/security/freenav/macbuild/SecurityConfig.h @@ -19,6 +19,9 @@ // within OpenTptInternet.h and will stupidly define these to 1 if they // have not been previously defined. The new PowerPlant (CWPro1) requires that // this be set to 0. (pinkerton) + +#error "Don't use me" + #define OLDROUTINENAMES 0 #ifndef OLDROUTINELOCATIONS #define OLDROUTINELOCATIONS 0 diff --git a/mozilla/xpcom/macbuild/xpcomConfig.h b/mozilla/xpcom/macbuild/xpcomConfig.h index 9ad5a4fe745..18071a403e3 100644 --- a/mozilla/xpcom/macbuild/xpcomConfig.h +++ b/mozilla/xpcom/macbuild/xpcomConfig.h @@ -1,3 +1,5 @@ +#error "Don't use me" + #define EDITOR 1 #include "NSCrossProductDefines.h"