[patch] Patch sent upstream

xpcom.patch (text/plain), 1.55 KB, created by Felix Janda on 2016-01-01 12:11:04 UTC

# HG changeset patch
# User Felix Janda <[e-mail]>
# Date 1451643054 -3600
#      Fri Jan 01 11:10:54 2016 +0100
# Node ID ded75fab9009f503e226220605bc0bdc7dab75f0
# Parent  22f51211915bf7daff076180847a7140d35aa353
Fix build of nsMemoryReporterManager on linux systems without mallinfo()

diff -r 22f51211915b -r ded75fab9009 configure.in
--- a/configure.in	Wed Dec 30 16:34:18 2015 -0800
+++ b/configure.in	Fri Jan 01 11:10:54 2016 +0100
@@ -2994,7 +2994,7 @@
 dnl ========================================================
 AC_PROG_GCC_TRADITIONAL
 AC_FUNC_MEMCMP
-AC_CHECK_FUNCS(stat64 lstat64 truncate64 statvfs64 statvfs statfs64 statfs getpagesize gmtime_r localtime_r arc4random arc4random_buf)
+AC_CHECK_FUNCS(stat64 lstat64 truncate64 statvfs64 statvfs statfs64 statfs getpagesize gmtime_r localtime_r arc4random arc4random_buf mallinfo)
 
 dnl check for clock_gettime(), the CLOCK_MONOTONIC clock
 AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC),
diff -r 22f51211915b -r ded75fab9009 xpcom/base/nsMemoryReporterManager.cpp
--- a/xpcom/base/nsMemoryReporterManager.cpp	Wed Dec 30 16:34:18 2015 -0800
+++ b/xpcom/base/nsMemoryReporterManager.cpp	Fri Jan 01 11:10:54 2016 +0100
@@ -153,6 +153,7 @@
   return GetProcSelfSmapsPrivate(aN);
 }
 
+#ifdef HAVE_MALLINFO
 #define HAVE_SYSTEM_HEAP_REPORTER 1
 nsresult
 SystemHeapSize(int64_t* aSizeOut)
@@ -172,6 +173,7 @@
     *aSizeOut = size_t(info.hblkhd) + size_t(info.uordblks);
     return NS_OK;
 }
+#endif
 
 #elif defined(__DragonFly__) || defined(__FreeBSD__) \
     || defined(__NetBSD__) || defined(__OpenBSD__) \