                               PR_LOG(sDragLm, PR_LOG_DEBUG,
                                      ("automatically adding target %s with \
                                      id %ld\n", urlTarget->target, urlAtom));
-*** misc/mozilla/xpcom/reflect/xptinfo/public/xptinfo.h	Tue Jun 24 18:12:34 2003
---- misc/build/mozilla/xpcom/reflect/xptinfo/public/xptinfo.h	Tue Jan 10 17:55:24 2006
+*** misc/mozilla/xpcom/base/nsStackFrameUnix.cpp	2004-03-08 08:47:44.000000000 +0100
+--- misc/build/mozilla/xpcom/base/nsStackFrameUnix.cpp	2006-02-24 09:45:04.000000000 +0100
+***************
+*** 78,102 ****
+  }
+  
+  
+! #if defined(linux) && defined(__GLIBC__) && (defined(__i386) || defined(PPC)) // i386 or PPC Linux stackwalking code
+  
+- #include <setjmp.h>
+- //
+  
+  void DumpStackToFile(FILE* aStream)
+  {
+-   jmp_buf jb;
+-   setjmp(jb);
+- 
+    // Stack walking code courtesy Kipp's "leaky".
+  
+!   // Get the frame pointer out of the jmp_buf
+!   void **bp = (void**)
+! #if defined(__i386) 
+!     (jb[0].__jmpbuf[JB_BP]);
+! #elif defined(PPC)
+!     (jb[0].__jmpbuf[JB_GPR1]);
+! #endif
+  
+    int skip = 2;
+    for ( ; (void**)*bp > bp; bp = (void**)*bp) {
+--- 78,92 ----
+  }
+  
+  
+! #if defined(linux) && defined(__GNUC__) && (defined(__i386) || defined(PPC)) // i386 or PPC Linux stackwalking code
+  
+  
+  void DumpStackToFile(FILE* aStream)
+  {
+    // Stack walking code courtesy Kipp's "leaky".
+  
+!   // Get the frame pointer
+!   void **bp = (void**) __builtin_frame_address(0);
+  
+    int skip = 2;
+    for ( ; (void**)*bp > bp; bp = (void**)*bp) {
+*** misc/mozilla/xpcom/base/nsTraceRefcntImpl.cpp	2004-02-11 08:16:10.000000000 +0100
+--- misc/build/mozilla/xpcom/base/nsTraceRefcntImpl.cpp	2006-02-24 09:45:04.000000000 +0100
+***************
+*** 50,68 ****
+  
+  #if defined(_WIN32)
+  #include <windows.h>
+- #elif defined(linux) && defined(__GLIBC__) && (defined(__i386) || defined(PPC))
+- #include <setjmp.h>
+- 
+- //
+- // On glibc 2.1, the Dl_info api defined in <dlfcn.h> is only exposed
+- // if __USE_GNU is defined.  I suppose its some kind of standards
+- // adherence thing.
+- //
+- #if (__GLIBC_MINOR__ >= 1) && !defined(__USE_GNU)
+- #define __USE_GNU
+- #endif
+- 
+- #include <dlfcn.h>
+  #endif
+  
+  #ifdef HAVE_LIBDL
+--- 50,55 ----
+***************
+*** 484,490 ****
+  
+  #endif /* NS_BUILD_REFCNT_LOGGING */
+  
+! nsresult
+  nsTraceRefcntImpl::DumpStatistics(StatisticsType type, FILE* out)
+  {
+    nsresult rv = NS_OK;
+--- 471,477 ----
+  
+  #endif /* NS_BUILD_REFCNT_LOGGING */
+  
+! NS_COM nsresult
+  nsTraceRefcntImpl::DumpStatistics(StatisticsType type, FILE* out)
+  {
+    nsresult rv = NS_OK;
+***************
+*** 561,567 ****
+    return rv;
+  }
+  
+! void
+  nsTraceRefcntImpl::ResetStatistics()
+  {
+  #ifdef NS_BUILD_REFCNT_LOGGING
+--- 548,554 ----
+    return rv;
+  }
+  
+! NS_COM void
+  nsTraceRefcntImpl::ResetStatistics()
+  {
+  #ifdef NS_BUILD_REFCNT_LOGGING
+***************
+*** 850,856 ****
+  
+  #if defined(_WIN32) && defined(_M_IX86) // WIN32 x86 stack walking code
+  #include "nsStackFrameWin.h"
+! void
+  nsTraceRefcntImpl::WalkTheStack(FILE* aStream)
+  {
+    DumpStackToFile(aStream);
+--- 837,843 ----
+  
+  #if defined(_WIN32) && defined(_M_IX86) // WIN32 x86 stack walking code
+  #include "nsStackFrameWin.h"
+! NS_COM void
+  nsTraceRefcntImpl::WalkTheStack(FILE* aStream)
+  {
+    DumpStackToFile(aStream);
+***************
+*** 858,866 ****
+  
+  // WIN32 x86 stack walking code
+  // i386 or PPC Linux stackwalking code or Solaris
+! #elif (defined(linux) && defined(__GLIBC__) && (defined(__i386) || defined(PPC))) || (defined(__sun) && (defined(__sparc) || defined(sparc) || defined(__i386) || defined(i386)))
+  #include "nsStackFrameUnix.h"
+! void
+  nsTraceRefcntImpl::WalkTheStack(FILE* aStream)
+  {
+    DumpStackToFile(aStream);
+--- 845,853 ----
+  
+  // WIN32 x86 stack walking code
+  // i386 or PPC Linux stackwalking code or Solaris
+! #elif (defined(linux) && defined(__GNUC__) && (defined(__i386) || defined(PPC))) || (defined(__sun) && (defined(__sparc) || defined(sparc) || defined(__i386) || defined(i386)))
+  #include "nsStackFrameUnix.h"
+! NS_COM void
+  nsTraceRefcntImpl::WalkTheStack(FILE* aStream)
+  {
+    DumpStackToFile(aStream);
+***************
+*** 960,966 ****
+  
+  #else // unsupported platform.
+  
+! void
+  nsTraceRefcntImpl::WalkTheStack(FILE* aStream)
+  {
+  	fprintf(aStream, "write me, dammit!\n");
+--- 947,953 ----
+  
+  #else // unsupported platform.
+  
+! NS_COM void
+  nsTraceRefcntImpl::WalkTheStack(FILE* aStream)
+  {
+  	fprintf(aStream, "write me, dammit!\n");
+*** misc/mozilla/xpcom/reflect/xptinfo/public/xptinfo.h	2003-06-25 00:12:34.000000000 +0200
+--- misc/build/mozilla/xpcom/reflect/xptinfo/public/xptinfo.h	2006-02-24 09:41:55.000000000 +0100
 ***************
 *** 132,138 ****
           }

  #endif
  
  /* Compressed datastreams are represented as arrays of JOCTET.
*** misc/mozilla/js/src/xpconnect/src/Makefile.in	Wed Jan  7 08:36:33 2004
--- misc/build/mozilla/js/src/xpconnect/src/Makefile.in	Tue Jan 10 17:55:24 2006
***************
*** 148,151 ****
  .NOTPARALLEL::

  CERT_DecodeDERCrl;
  CERT_DestroyCertificateRequest;
  CERT_DestroyCertList;
*** misc/mozilla/security/nss/lib/pki1/oiddata.h	2002-01-04 06:22:07.000000000 +0100
--- misc/build/mozilla/security/nss/lib/pki1/oiddata.h	2006-02-24 09:41:55.000000000 +0100
***************
*** 39,49 ****
  static const char OIDDATA_CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$ $Name$ ; @(#) $RCSfile$ $Revision$ $Date$ $Name$";
