diff options
| author | J0WI <J0WI@users.noreply.github.com> | 2019-10-26 17:04:12 +0200 |
|---|---|---|
| committer | Rasmus Thomsen <oss@cogitri.dev> | 2019-10-26 23:11:17 +0200 |
| commit | 7e130731a332e3d5d593b52869e2f4e02da33f59 (patch) | |
| tree | 5078b4359f3939c406c071405faea8bedc516154 /testing/thunderbird/mallinfo.patch | |
| parent | 00be3a44472d6239a5052218d41d055fba9b3634 (diff) | |
| download | aports-7e130731a332e3d5d593b52869e2f4e02da33f59.tar.bz2 aports-7e130731a332e3d5d593b52869e2f4e02da33f59.tar.xz | |
testing/thunderbird: upgrade to 68.2.0
Diffstat (limited to 'testing/thunderbird/mallinfo.patch')
| -rw-r--r-- | testing/thunderbird/mallinfo.patch | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/testing/thunderbird/mallinfo.patch b/testing/thunderbird/mallinfo.patch index 91c65dd059..7916a200ca 100644 --- a/testing/thunderbird/mallinfo.patch +++ b/testing/thunderbird/mallinfo.patch @@ -1,18 +1,20 @@ +diff --git a/xpcom/base/nsMemoryReporterManager.cpp b/xpcom/base/nsMemoryReporterManager.cpp +index 865e1b5430..9a00dafecb 100644 --- a/xpcom/base/nsMemoryReporterManager.cpp +++ b/xpcom/base/nsMemoryReporterManager.cpp -@@ -153,6 +153,7 @@ ResidentUniqueDistinguishedAmount(int64_t* aN) +@@ -124,6 +124,7 @@ static MOZ_MUST_USE nsresult ResidentUniqueDistinguishedAmount(int64_t* aN) { return GetProcSelfSmapsPrivate(aN); } - + +#ifdef __GLIBC__ - #define HAVE_SYSTEM_HEAP_REPORTER 1 - nsresult - SystemHeapSize(int64_t* aSizeOut) -@@ -172,6 +173,7 @@ SystemHeapSize(int64_t* aSizeOut) - *aSizeOut = size_t(info.hblkhd) + size_t(info.uordblks); - return NS_OK; + # ifdef HAVE_MALLINFO + # define HAVE_SYSTEM_HEAP_REPORTER 1 + static MOZ_MUST_USE nsresult SystemHeapSize(int64_t* aSizeOut) { +@@ -143,6 +144,7 @@ static MOZ_MUST_USE nsresult SystemHeapSize(int64_t* aSizeOut) { + return NS_OK; } + # endif +#endif - - #elif defined(__DragonFly__) || defined(__FreeBSD__) \ - || defined(__NetBSD__) || defined(__OpenBSD__) \ + + #elif defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || \ + defined(__OpenBSD__) || defined(__FreeBSD_kernel__) |