Undoing accidental changes.

xpcom/base/MANIFEST

@@ -13,9 +13,10 @@ nsISupportsBase.h
 nsISupportsImpl.h
 nsISupportsUtils.h
 nsISupportsObsolete.h
-nsStackWalker.h
 nsTraceRefcnt.h
 nsWeakReference.h
 nsWeakPtr.h
 nscore.h
+nslog.h
+nslog.h
 nsIInterfaceRequestorUtils.h

xpcom/base/Makefile.in

@@ -40,7 +40,6 @@ CPPSRCS		= \
 		nsErrorService.cpp \
 		nsDebug.cpp \
 		nsIInterfaceRequestor.cpp \
-		nsStackWalker.cpp \
 		nsTraceRefcnt.cpp \
 		nsID.cpp \
 		nsCWeakReference.cpp \
@@ -49,7 +48,6 @@ CPPSRCS		= \
 		nsConsoleMessage.cpp \
 		nsExceptionService.cpp \
 		$(NULL)
-#		nsBloatLogging.cpp \
 
 ifdef GC_LEAK_DETECTOR
 CSRCS += nsGarbageCollector.c
@@ -59,28 +57,26 @@ endif
 
 EXPORTS		= \
 		nsAgg.h \
-		nsAutoPtr.h \
+		nsIAllocator.h \
+		nsMemory.h \
 		nsCom.h \
 		nsComObsolete.h \
-		nscore.h \
 		nsCWeakReference.h \
 		nsDebug.h \
 		nsError.h \
-		nsIAllocator.h \
 		nsID.h \
 		nsIID.h \
-		nsIInterfaceRequestorUtils.h \
 		nsIPtr.h \
 		nsISupportsBase.h \
 		nsISupportsImpl.h \
-		nsISupportsObsolete.h \
 		nsISupportsUtils.h \
-		nslog.h \
-		nsMemory.h \
-		nsStackWalker.h \
+		nsISupportsObsolete.h \
 		nsTraceRefcnt.h \
-		nsWeakPtr.h \
 		nsWeakReference.h \
+		nsWeakPtr.h \
+		nscore.h \
+		nslog.h \
+		nsIInterfaceRequestorUtils.h \
 		$(NULL)
 
 ifdef NS_TRACE_MALLOC

xpcom/base/makefile.win

@@ -45,12 +45,12 @@ EXPORTS =                  \
 	nsISupportsImpl.h  \
         nsISupportsObsolete.h  \
         nsISupportsUtils.h \
-        nsStackWalker.h    \
         nsTraceRefcnt.h    \
         nsWeakReference.h  \
         nsWeakPtr.h        \
         nscore.h           \
         pure.h             \
+        nslog.h            \
 !ifdef MOZ_TRACE_MALLOC
 		nsTraceMalloc.h    \
 !endif
@@ -60,6 +60,7 @@ EXPORTS =                  \
 XPIDL_MODULE = xpcom_base
 
 XPIDLSRCS =               \
+        .\nsILoggingService.idl   \
         .\nsrootidl.idl   \
         .\nsIErrorService.idl \
         .\nsIMemory.idl \
@@ -100,6 +101,7 @@ C_OBJS =                                    \
 !endif
 
 CPP_OBJS =                            \
+        .\$(OBJDIR)\nsLogging.obj       \
         .\$(OBJDIR)\nsErrorService.obj       \
         .\$(OBJDIR)\nsDebug.obj       \
         .\$(OBJDIR)\nsAllocator.obj   \
@@ -107,7 +109,6 @@ CPP_OBJS =                            \
         .\$(OBJDIR)\nsCWeakReference.obj \
         .\$(OBJDIR)\nsID.obj          \
         .\$(OBJDIR)\nsIInterfaceRequestor.obj \
-        .\$(OBJDIR)\nsStackWalker.obj \
 #        .\$(OBJDIR)\nsSystemInfo.obj  \
         .\$(OBJDIR)\nsExceptionService.obj \
         .\$(OBJDIR)\nsTraceRefcnt.obj \