diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2016-03-25 11:04:18 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2016-03-26 21:08:05 +0100 |
commit | 2c420855ca68eaf1586a882fe85dc6ad518dcc7a (patch) | |
tree | 0dc148f2edb1ac3f8624b78f636dafa90ad564d4 /package/firefox/patches/patch-xpcom_base_nsMemoryReporterManager_cpp | |
parent | 2bea9aa06273cdd6476f10b52a320f8c18e788ea (diff) |
firefox: update to version 45.0
Diffstat (limited to 'package/firefox/patches/patch-xpcom_base_nsMemoryReporterManager_cpp')
-rw-r--r-- | package/firefox/patches/patch-xpcom_base_nsMemoryReporterManager_cpp | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/package/firefox/patches/patch-xpcom_base_nsMemoryReporterManager_cpp b/package/firefox/patches/patch-xpcom_base_nsMemoryReporterManager_cpp new file mode 100644 index 000000000..e13b23274 --- /dev/null +++ b/package/firefox/patches/patch-xpcom_base_nsMemoryReporterManager_cpp @@ -0,0 +1,18 @@ +--- firefox-45.0.orig/xpcom/base/nsMemoryReporterManager.cpp 2016-03-03 22:48:07.000000000 +0100 ++++ firefox-45.0/xpcom/base/nsMemoryReporterManager.cpp 2016-03-15 08:42:15.629014068 +0100 +@@ -157,6 +157,7 @@ ResidentUniqueDistinguishedAmount(int64_ + nsresult + SystemHeapSize(int64_t* aSizeOut) + { ++#if defined(__GLIBC__) && !defined(__UCLIBC__) + struct mallinfo info = mallinfo(); + + // The documentation in the glibc man page makes it sound like |uordblks| +@@ -170,6 +171,7 @@ SystemHeapSize(int64_t* aSizeOut) + // shouldn't be a problem. Nonetheless, cast the |int|s to |size_t| before + // adding them to provide a small amount of extra overflow protection. + *aSizeOut = size_t(info.hblkhd) + size_t(info.uordblks); ++#endif + return NS_OK; + } + |