i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Allow heap.cpp to compile if both, KERNEL_HEAP_LEAK_CHECK, and

Browse Source 
USE_SLAB_ALLOCATOR_FOR_MALLOC are defined.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37837 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2010-08-02 11:10:51 +00:00
parent da6c14611b
commit 29145bab8a
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/heap.cpp
+9 -4
View File
@@ -32,6 +32,11 @@
#endif #endif
#if USE_SLAB_ALLOCATOR_FOR_MALLOC
# undef KERNEL_HEAP_LEAK_CHECK
#endif
#if KERNEL_HEAP_LEAK_CHECK #if KERNEL_HEAP_LEAK_CHECK
typedef struct heap_leak_check_info_s { typedef struct heap_leak_check_info_s {
addr_t caller; addr_t caller;
@@ -49,7 +54,7 @@ struct caller_info {
static const int32 kCallerInfoTableSize = 1024; static const int32 kCallerInfoTableSize = 1024;
static caller_info sCallerInfoTable[kCallerInfoTableSize]; static caller_info sCallerInfoTable[kCallerInfoTableSize];
static int32 sCallerInfoCount = 0; static int32 sCallerInfoCount = 0;
#endif #endif // KERNEL_HEAP_LEAK_CHECK
typedef struct heap_page_s heap_page; typedef struct heap_page_s heap_page;
@@ -278,9 +283,6 @@ class Free : public AbstractTraceEntry {
// #pragma mark - Debug functions // #pragma mark - Debug functions
#if !USE_SLAB_ALLOCATOR_FOR_MALLOC
#if KERNEL_HEAP_LEAK_CHECK #if KERNEL_HEAP_LEAK_CHECK
static addr_t static addr_t
get_caller() get_caller()
@@ -303,6 +305,9 @@ get_caller()
#endif #endif
#if !USE_SLAB_ALLOCATOR_FOR_MALLOC
static void static void
dump_page(heap_page *page) dump_page(heap_page *page)
{ {