Differential D18757 Diff 52594 www/qt5-webengine/files/patch-src_3rdparty_chromium_base_trace__event_malloc__dump__provider.cc

Changeset View

Standalone View

	--- src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc.orig 2017-01-26 00:49:07 UTC			--- src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc.orig 2018-11-13 18:25:11 UTC
	+++ src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc			+++ src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc
	@@ -21,7 +21,7 @@			@@ -18,7 +18,7 @@
	#if defined(OS_MACOSX)			#if defined(OS_MACOSX)
	#include <malloc/malloc.h>			#include <malloc/malloc.h>
	#else			#else
	-#include <malloc.h>			-#include <malloc.h>
	+#include <stdlib.h>			+#include <stdlib.h>
	#endif			#endif
	#if defined(OS_WIN)			#if defined(OS_WIN)
	#include <windows.h>			#include <windows.h>
				@@ -132,6 +132,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump
				}
				#elif defined(OS_FUCHSIA)
				// TODO(fuchsia): Port, see https://crbug.com/706592.
				+#elif defined(OS_BSD)
				+ total_virtual_size = 0;
				+ allocated_objects_size = 0;
				#else
				struct mallinfo info = mallinfo();
				DCHECK_GE(info.arena + info.hblkhd, info.uordblks);