From 62ff5ce10bf0c2d129e572d67e6504436b8458cf Mon Sep 17 00:00:00 2001 From: "tbogard%aol.net" Date: Mon, 29 Nov 1999 22:12:28 +0000 Subject: [PATCH] A couple of changes to get building on Unix. Thanks to andreas.otte@primus-online.de for the patch. git-svn-id: svn://10.0.0.236/trunk@54606 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/docshell/base/nsDocShell.cpp | 6 +++--- mozilla/docshell/build/Makefile.in | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/mozilla/docshell/base/nsDocShell.cpp b/mozilla/docshell/base/nsDocShell.cpp index ea81dd4d83f..bdaf641fb88 100644 --- a/mozilla/docshell/base/nsDocShell.cpp +++ b/mozilla/docshell/base/nsDocShell.cpp @@ -1643,7 +1643,7 @@ nsDocShell::FireStartDocumentLoad(nsIDocumentLoader* aLoader, NS_ENSURE_ARG_POINTER(aCommand); nsCOMPtr docViewer; - if (mScriptGlobal && (aLoader == mDocLoader)) + if (mScriptGlobal && (aLoader == mDocLoader.get())) { docViewer = do_QueryInterface(mContentViewer); if (docViewer) @@ -1666,7 +1666,7 @@ nsDocShell::FireStartDocumentLoad(nsIDocumentLoader* aLoader, } } - if (aLoader == mDocLoader) + if (aLoader == mDocLoader.get()) { nsCOMPtr dlObserver; @@ -1724,7 +1724,7 @@ nsDocShell::FireEndDocumentLoad(nsIDocumentLoader* aLoader, nsCOMPtr aURL; NS_ENSURE_SUCCESS(aChannel->GetURI(getter_AddRefs(aURL)), NS_ERROR_FAILURE); - if (aLoader == mDocLoader) + if (aLoader == mDocLoader.get()) { if (mScriptGlobal && mContentViewer) { diff --git a/mozilla/docshell/build/Makefile.in b/mozilla/docshell/build/Makefile.in index 7443467bf9d..72d25556ed4 100644 --- a/mozilla/docshell/build/Makefile.in +++ b/mozilla/docshell/build/Makefile.in @@ -34,7 +34,6 @@ CPPSRCS = \ $(NULL) EXTRA_DSO_LDOPTS= \ - $(DIST)/lib/libhtmldocshell_s.a \ $(DIST)/lib/libbasedocshell_s.a \ $(NULL)