[GTK][WPE] Fix MALLOC_HEAP_BREAKDOWN build with system headers defining boolean_t

blino · blino · commit 2907cb6685d8 · 2025-10-21T01:34:56.000-07:00
https://bugs.webkit.org/show_bug.cgi?id=300884 Reviewed by Michael Catanzaro. Remove useless boolean_t define and include stdbool.h instead. This define can conflict with another define of boolean_t, from a system header pulled by files using FastMalloc. Also add missing extern "C" block. * Source/WTF/wtf/malloc_heap_breakdown/main.cpp: (malloc_zone_print): * Source/WTF/wtf/malloc_heap_breakdown/malloc/malloc.h: Canonical link: https://commits.webkit.org/301861@main
diff --git a/Source/WTF/wtf/malloc_heap_breakdown/main.cpp b/Source/WTF/wtf/malloc_heap_breakdown/main.cpp
@@ -296,6 +296,6 @@ size_t malloc_zone_pressure_relief(malloc_zone_t*, size_t)
     return 0;
 }
 
-void malloc_zone_print(malloc_zone_t*, boolean_t)
+void malloc_zone_print(malloc_zone_t*, bool)
 {
 }
diff --git a/Source/WTF/wtf/malloc_heap_breakdown/malloc/malloc.h b/Source/WTF/wtf/malloc_heap_breakdown/malloc/malloc.h
@@ -25,6 +25,11 @@
 
 #pragma once
 
+#ifndef __cplusplus
+extern "C" {
+#endif
+
+#include <stdbool.h>
 #include <stddef.h>
 
 /* This file was inspired by malloc.h from MacOS. */
@@ -33,7 +38,6 @@ typedef struct _malloc_zone_t {
 } malloc_zone_t;
 
 typedef size_t vm_size_t;
-typedef bool boolean_t;
 
 /********* Creation and destruction ************/
 
@@ -79,5 +83,9 @@ size_t malloc_zone_pressure_relief(malloc_zone_t *zone, size_t goal);
 
 /********* Debug helpers ************/
 
-extern void malloc_zone_print(malloc_zone_t *zone, boolean_t verbose);
+extern void malloc_zone_print(malloc_zone_t *zone, bool verbose);
     /* Prints summary on zone; if !zone, prints all zones */
+
+#ifndef __cplusplus
+}
+#endif

Original file line number	Diff line number	Diff line change
`@@ -296,6 +296,6 @@ size_t malloc_zone_pressure_relief(malloc_zone_t*, size_t)`
`296`	`296`	`return 0;`
`297`	`297`	`}`
`298`	`298`
`299`		`-void malloc_zone_print(malloc_zone_t*, boolean_t)`
	`299`	`+void malloc_zone_print(malloc_zone_t*, bool)`
`300`	`300`	`{`
`301`	`301`	`}`