Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-03 06:28:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_HAL_Linux: switched ENABLE_HEAP to an #if

Browse Source
This commit is contained in:
Andrew Tridgell 2024-07-06 09:05:51 +10:00 committed by Peter Barker
parent f235b71f6b
commit 3980cbbb82
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/AP_HAL_Linux/Util.cpp
View File

@ -241,7 +241,7 @@ int Util::get_hw_arm32()
return -ENOENT; return -ENOENT;
} }
#ifdef ENABLE_HEAP #if ENABLE_HEAP
void *Util::allocate_heap_memory(size_t size) void *Util::allocate_heap_memory(size_t size)
{ {
struct heap *new_heap = (struct heap*)malloc(sizeof(struct heap)); struct heap *new_heap = (struct heap*)malloc(sizeof(struct heap));

4
libraries/AP_HAL_Linux/Util.h
View File

@ -71,7 +71,7 @@ public:
bool get_system_id(char buf[50]) override; bool get_system_id(char buf[50]) override;
bool get_system_id_unformatted(uint8_t buf[], uint8_t &len) override; bool get_system_id_unformatted(uint8_t buf[], uint8_t &len) override;
#ifdef ENABLE_HEAP #if ENABLE_HEAP
// heap functions, note that a heap once alloc'd cannot be dealloc'd // heap functions, note that a heap once alloc'd cannot be dealloc'd
virtual void *allocate_heap_memory(size_t size) override; virtual void *allocate_heap_memory(size_t size) override;
virtual void *heap_realloc(void *h, void *ptr, size_t old_size, size_t new_size) override; virtual void *heap_realloc(void *h, void *ptr, size_t old_size, size_t new_size) override;
@ -116,7 +116,7 @@ private:
const char *custom_defaults = HAL_PARAM_DEFAULTS_PATH; const char *custom_defaults = HAL_PARAM_DEFAULTS_PATH;
static const char *_hw_names[UTIL_NUM_HARDWARES]; static const char *_hw_names[UTIL_NUM_HARDWARES];
#ifdef ENABLE_HEAP #if ENABLE_HEAP
struct heap_allocation_header { struct heap_allocation_header {
size_t allocation_size; // size of allocated block, not including this header size_t allocation_size; // size of allocated block, not including this header
}; };