From 43c69ced734e423c3979922f36e7a90fddaacfc2 Mon Sep 17 00:00:00 2001
From: "dougt%netscape.com"
 <dougt%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 18 Aug 2005 11:16:44 +0000
Subject: [PATCH] Create a new xpcom obsolete library (and component library). 
  Moved nsFileSpec and related classes into this obsolete library.   Moved
 nsRegistry and related libreg functionality into the obsolete library.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Updated many callers using the obsolete nsFile spec to use nsIFile and Necko to do file IO.

Combined the following DLLs (source -> dest)
  uriloader -> docshell
  shistory -> docshell
  jsurl -> jsdom
  gkview -> gklayout

Moved nsAdapterEnumerator out of xpcom/ds and into mailnews, since they're the only consumer

Modifed the xpt_link tool so that you can specify a “only include” cid list that can mask CID’s that you are not interested in.

Added build options:
Prevent the building of xpinstall (--disable-xpinstall)
Prevent the building js component loader (--disable-jsloader)
A build option to only build a single profile (--enable-single-profile)
A build flag to only built the required xpfe components (--disable-xpfe-components).

Removal or hiding of unused functions and classes including nsEscape*, nsDequeIterator, nsRecyclingAllocatorImpl, nsDiscriminatedUnion, nsOpaqueKey, nsCRT::strlen, NS_NewCommandLineService

Bug 194240, r/sr = darin, alec.


git-svn-id: svn://10.0.0.236/trunk@178126 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/docshell/shistory/public/nsISHistoryInternal.idl | 2 +-
 mozilla/docshell/shistory/src/Makefile.in                | 7 ++-----
 mozilla/docshell/shistory/src/nsSHistory.cpp             | 1 +
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/mozilla/docshell/shistory/public/nsISHistoryInternal.idl b/mozilla/docshell/shistory/public/nsISHistoryInternal.idl
index ae7af1354bb..5959d779806 100644
--- a/mozilla/docshell/shistory/public/nsISHistoryInternal.idl
+++ b/mozilla/docshell/shistory/public/nsISHistoryInternal.idl
@@ -40,9 +40,9 @@
 #include "nsIFactory.idl"
 #include "nsISHEntry.idl"
 #include "nsISHTransaction.idl"
-#include "nsIDocShell.idl"
 
 interface nsISHistoryListener;
+interface nsIDocShell;
 
 %{C++
 #define NS_SHISTORY_INTERNAL_CID \
diff --git a/mozilla/docshell/shistory/src/Makefile.in b/mozilla/docshell/shistory/src/Makefile.in
index 8137f54a56b..3ae97ccb550 100644
--- a/mozilla/docshell/shistory/src/Makefile.in
+++ b/mozilla/docshell/shistory/src/Makefile.in
@@ -27,11 +27,9 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= shistory
-LIBRARY_NAME	= shistory
+LIBRARY_NAME	= shistory_s
 EXPORT_LIBRARY = 1
-IS_COMPONENT	= 1
-MODULE_NAME	= Session_History_Module
-GRE_MODULE	= 1
+FORCE_STATIC_LIB = 1
 
 REQUIRES	= xpcom \
 		  string \
@@ -44,7 +42,6 @@ REQUIRES	= xpcom \
 
 CPPSRCS		= nsSHEntry.cpp        \
             nsSHTransaction.cpp   \
-            nsSHistoryModule.cpp \
             nsSHistory.cpp \
             $(NULL)
 
diff --git a/mozilla/docshell/shistory/src/nsSHistory.cpp b/mozilla/docshell/shistory/src/nsSHistory.cpp
index 36b0d77f9b9..836959ba8bd 100644
--- a/mozilla/docshell/shistory/src/nsSHistory.cpp
+++ b/mozilla/docshell/shistory/src/nsSHistory.cpp
@@ -29,6 +29,7 @@
 
 // Interfaces Needed
 #include "nsILayoutHistoryState.h"
+#include "nsIDocShell.h"
 #include "nsIDocShellLoadInfo.h"
 #include "nsISHContainer.h"
 #include "nsIDocShellTreeItem.h"