patches/firefox3-19-enable-about-memory.diff
author yippi
Mon, 27 Sep 2010 21:07:51 +0000
changeset 20108 51df67ca9307
parent 17213 e3516dc96829
permissions -rw-r--r--
I had these modules listed as being owned by me, but they are really owned by wangke, correcting.

diff --git a/xpcom/base/nsMemoryReporterManager.cpp b/xpcom/base/nsMemoryReporterManager.cpp
--- a/xpcom/base/nsMemoryReporterManager.cpp
+++ b/xpcom/base/nsMemoryReporterManager.cpp
@@ -47,17 +47,17 @@
  ** to obtain info on total memory in use (that we know about,
  ** at least -- on OSX, there are sometimes other zones in use).
  **/
 
 /* Because of the way that jemalloc is linked on linux, we can't
  * get to jemalloc_stats().  So just do this on Windows until
  * that's fixed.
  */
-#if defined(MOZ_MEMORY) && defined(XP_WIN)
+#if defined(MOZ_MEMORY) && (defined(XP_WIN) || defined(SOLARIS))
 #define HAVE_JEMALLOC_STATS 1
 #else
 #undef HAVE_JEMALLOC_STATS
 #endif
 
 #if defined(HAVE_JEMALLOC_STATS)
 #define HAVE_MALLOC_REPORTERS 1
 #include "jemalloc.h"