diff options
Diffstat (limited to 'www/seamonkey/files/patch-bug946560')
| -rw-r--r-- | www/seamonkey/files/patch-bug946560 | 30 |
1 files changed, 24 insertions, 6 deletions
diff --git a/www/seamonkey/files/patch-bug946560 b/www/seamonkey/files/patch-bug946560 index f1ab78af9cce..7ef52a57a6b7 100644 --- a/www/seamonkey/files/patch-bug946560 +++ b/www/seamonkey/files/patch-bug946560 @@ -2,7 +2,16 @@ diff --git xpcom/base/nsMemoryInfoDumper.cpp xpcom/base/nsMemoryInfoDumper.cpp index 0b2f78c..d857374 100644 --- mozilla/xpcom/base/nsMemoryInfoDumper.cpp +++ mozilla/xpcom/base/nsMemoryInfoDumper.cpp -@@ -30,7 +30,7 @@ +@@ -6,7 +6,7 @@ + + #include "mozilla/nsMemoryInfoDumper.h" + +-#ifdef XP_LINUX ++#if defined(XP_LINUX) || defined(__FreeBSD__) + #include "mozilla/Preferences.h" + #endif + #include "mozilla/unused.h" +@@ -31,7 +31,7 @@ #include <unistd.h> #endif @@ -11,7 +20,7 @@ index 0b2f78c..d857374 100644 #include <fcntl.h> #include <sys/types.h> #include <sys/stat.h> -@@ -109,7 +109,7 @@ private: +@@ -110,7 +110,7 @@ private: } // anonymous namespace @@ -20,7 +29,7 @@ index 0b2f78c..d857374 100644 namespace { /* -@@ -548,7 +548,7 @@ nsMemoryInfoDumper::~nsMemoryInfoDumper( +@@ -552,7 +552,7 @@ nsMemoryInfoDumper::~nsMemoryInfoDumper() /* static */ void nsMemoryInfoDumper::Initialize() { @@ -30,11 +39,20 @@ index 0b2f78c..d857374 100644 FifoWatcher::MaybeCreate(); #endif diff --git xpcom/base/nsMemoryReporterManager.cpp xpcom/base/nsMemoryReporterManager.cpp -index 8c65665..8f6d0e9 100644 +index 1252e27..6f22093 100644 --- mozilla/xpcom/base/nsMemoryReporterManager.cpp +++ mozilla/xpcom/base/nsMemoryReporterManager.cpp -@@ -824,7 +824,7 @@ nsMemoryReporterManager::Init() - RegisterReporter(new mozilla::dmd::DMDReporter); +@@ -17,7 +17,7 @@ + #include "nsPIDOMWindow.h" + #include "nsIObserverService.h" + #include "nsIGlobalObject.h" +-#if defined(XP_LINUX) ++#if defined(XP_LINUX) || defined(__FreeBSD__) + #include "nsMemoryInfoDumper.h" + #endif + #include "mozilla/Attributes.h" +@@ -898,7 +898,7 @@ nsMemoryReporterManager::Init() + RegisterStrongReporter(new mozilla::dmd::DMDReporter()); #endif -#if defined(XP_LINUX) |