From fd525c9994e7f4e97489acab4e61e449eeded046 Mon Sep 17 00:00:00 2001
From: "sfraser%netscape.com"
 <sfraser%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 30 Nov 2000 04:35:38 +0000
Subject: [PATCH] Making this mess build on Mac, fixing the tinderbox bustage.

git-svn-id: svn://10.0.0.236/trunk@83106 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../embedding/browser/macbuild/browserIDL.mcp | Bin 72649 -> 79010 bytes
 .../browser/webBrowser/nsDOMWalker.h          |   2 +-
 .../browser/webBrowser/nsWebBrowserPersist.h  |  22 +++++++++---------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/mozilla/embedding/browser/macbuild/browserIDL.mcp b/mozilla/embedding/browser/macbuild/browserIDL.mcp
index c9fe21ccb713fa5a31a8763969afb67c75119908..1948ee0116235e2e1f708dc290b49badb5176235 100644
GIT binary patch
delta 2476
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
AssI20

delta 1632
zcmY*ZdrVVT7(d_b?d^+J=*3bBt7SUGf~A7539C3jM<Sylb0$V0_()g~h%y)BAHtRy
zmn_Vi<93p{xVkLHZ5mi^7}*Q=&$8egg3BIR<}yt*xG;1vi%}QZ@ATHio#eaUIltfc
zJdgX{4Rw4}E!@%5)5RFGF-9efvd0<a{Kc5-XJDNl7amv4i^{JyBN^n8l*)&+8UC*0
zbt9=h*93!h#_Uy$IWc8T>~mJgzGqDBnD|}om>T|wF*ky)hrq5Vm$5}KlWXQ@4tyEY
znUdDv7(o{Bgu8$ra`||vJNJ-8SaVZTi_{N?w!UFwJ&N^Zv_GTuj1FdWAfxl7V@>!@
z^NbaNj<O=g!n0b0>XEdb1_<$~g$Ba2Hz!eZmb9Onn>ka0i3W+t8X*fI`H;sT;mo=S
z`f+1jLE--lQQmw=0D|-mex+FF{d?`aUytw$o)G_3Pw;ZDhmZT0@>|>N;RYmNSqSxL
z_;hHQhTA#@7H3L9M0rv{h!5h2=#X?K=%BG~9bfAXIf$@%MEt0yieGXSn9~m&gj6bD
zp-1_-Tsx1u=b7c+N!8f!Z3Zvpcm1omksC9Tc5|nG*};pi7MSt6vkG^Gz0Q#fPvOKX
zhs{8D0r7a<Jzk#M!Bd+jjpTA3*->O9T~IzgRrC&Qt6yfU`jlBzcb|CgqWKc(nVb9j
zeIWIUnHv6u$cgzbf=?C?M-!v_^2tV{z4OSSn#JAiDj#rGkP9}7V!qbbsPg?wPV-x9
zy!?#rH5#3!??8@?XD4oRGw}qfoW`OSi(0w3VKXDCt(tjrE@G2@qpO^hr5MSG+1s+h
zW*$71qggwW+I-$T(i|is*=E*xvx)mU_8ZABdD5qu8+Ob*$zS>4F5=xIAWm~<v}&HY
zxNa4p0iT`h=FrGzdFIV+HXCewXeH$~wI8l7LEgAS<}7r8h}%YM-IQ$?RZ+@UQVYbE
zDE+8Jw~JUQ1scnD;heI2_wL%w)FF9Am&?1rSo}pCbkf3IZva@4hFRs;&=nS*FQ3iI
z41NbUL>Q%{YgIXL^@|TnX&)^V;W7#+9X7GDjAEK=Bdmj?FO<<i%3p}b%l7p3b^*iP
zc{tpM#e=03Q#_i8#V8Q+1i%FM^mX+>KVs+X7p;<i2642l>5A<2ov@Lw9OL<uVlYOb
zK;D>D?etlI#c7Ipu8A?}`|Lr4j9C20FgW?<Fuv;)voSiQINug;mD749QXzhW4mnSQ
z%(Zg0ZNa=+TH|juB@%JOb4RhrviQ~CV4jdHp71fzE%_3>ZwgxZ?%f7aBU#2a9Tz9!
zl$S3LAZEF@{)ze1lEgo#R!qQMajz8D<0!||En>?MZtB2)t?Sw+2rbiN{4^z6C4c!E
z{uce|czVw{@MRXieMAgO{yq*r)4tx_4nAh_4_*~x%h0~(yx3hqgCTDSxYf2kjnkz}
z+nyuBS4nvd(#`5x@9zbj>ALj`;ODLMn@#{<YlUw+jJdT7`b%G7USr{FHi+&@l;t1C
s+S&&F;y>W6Z6M`MaYFKX9DIot_tGEW>(c(Do)i<{m8>h`dL@<p3-i5nQ~&?~

diff --git a/mozilla/embedding/browser/webBrowser/nsDOMWalker.h b/mozilla/embedding/browser/webBrowser/nsDOMWalker.h
index da7cbb85eec..8ee1b088e75 100644
--- a/mozilla/embedding/browser/webBrowser/nsDOMWalker.h
+++ b/mozilla/embedding/browser/webBrowser/nsDOMWalker.h
@@ -23,7 +23,7 @@
 #ifndef NSDOMWALKER_H
 #define NSDOMWALKER_H
 
-#include <nsIDOMNode.h>
+#include "nsIDOMNode.h"
 
 class nsDOMWalkerCallback
 {
diff --git a/mozilla/embedding/browser/webBrowser/nsWebBrowserPersist.h b/mozilla/embedding/browser/webBrowser/nsWebBrowserPersist.h
index 0433df7025a..864901a27a5 100644
--- a/mozilla/embedding/browser/webBrowser/nsWebBrowserPersist.h
+++ b/mozilla/embedding/browser/webBrowser/nsWebBrowserPersist.h
@@ -23,18 +23,18 @@
 #ifndef nsWebBrowserPersist_h__
 #define nsWebBrowserPersist_h__
 
-#include <nsCOMPtr.h>
+#include "nsCOMPtr.h"
 
-#include <nsIMIMEService.h>
-#include <nsIStreamListener.h>
-#include <nsIOutputStream.h>
-#include <nsIInputStream.h>
-#include <nsIFileStream.h>
-#include <nsIChannel.h>
-#include <nsIStyleSheet.h>
-#include <nsIDocumentEncoder.h>
+#include "nsIMIMEService.h"
+#include "nsIStreamListener.h"
+#include "nsIOutputStream.h"
+#include "nsIInputStream.h"
+#include "nsIFileStream.h"
+#include "nsIChannel.h"
+#include "nsIStyleSheet.h"
+#include "nsIDocumentEncoder.h"
 
-#include <nsHashtable.h>
+#include "nsHashtable.h"
 
 #include "nsIWebBrowserPersist.h"
 #include "nsDOMWalker.h"
@@ -46,7 +46,7 @@ class nsWebBrowserPersist : public nsIWebBrowserPersist,
                             public nsIStreamListener,
                             public nsDOMWalkerCallback
 {
-    friend nsEncoderNodeFixup;
+    friend class nsEncoderNodeFixup;
 
 // Public members
 public: