Skip to content

Commit a28217b

Browse files
kilograhamWren6991
authored andcommitted
missing pico/malloc.h fixes earlephilhower#136
1 parent 8b9907e commit a28217b

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

src/rp2_common/pico_malloc/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ if (NOT TARGET pico_malloc)
66
${CMAKE_CURRENT_LIST_DIR}/pico_malloc.c
77
)
88

9+
target_include_directories(pico_malloc INTERFACE ${CMAKE_CURRENT_LIST_DIR}/include)
10+
911
pico_wrap_function(pico_malloc malloc)
1012
pico_wrap_function(pico_malloc calloc)
1113
pico_wrap_function(pico_malloc free)

src/rp2_common/pico_malloc/pico_malloc.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#include <stdlib.h>
88
#include <stdio.h>
99
#include "pico.h"
10+
#include "pico/malloc.h"
1011

1112
#if PICO_USE_MALLOC_MUTEX
1213
#include "pico/mutex.h"
@@ -35,7 +36,7 @@ void *__wrap_malloc(size_t size) {
3536
#if PICO_USE_MALLOC_MUTEX
3637
mutex_exit(&malloc_mutex);
3738
#endif
38-
#ifdef PICO_DEBUG_MALLOC
39+
#if PICO_DEBUG_MALLOC
3940
if (!rc || ((uint8_t *)rc) + size > (uint8_t*)PICO_DEBUG_MALLOC_LOW_WATER) {
4041
printf("malloc %d %p->%p\n", (uint) size, rc, ((uint8_t *) rc) + size);
4142
}
@@ -52,7 +53,7 @@ void *__wrap_calloc(size_t count, size_t size) {
5253
#if PICO_USE_MALLOC_MUTEX
5354
mutex_exit(&malloc_mutex);
5455
#endif
55-
#ifdef PICO_DEBUG_MALLOC
56+
#if PICO_DEBUG_MALLOC
5657
if (!rc || ((uint8_t *)rc) + size > (uint8_t*)PICO_DEBUG_MALLOC_LOW_WATER) {
5758
printf("calloc %d %p->%p\n", (uint) (count * size), rc, ((uint8_t *) rc) + size);
5859
}

0 commit comments

Comments
 (0)