From 8b6d27d0e5854744aeed7ecbb3261013a0a41cf8 Mon Sep 17 00:00:00 2001
From: graham sanderson <graham.sanderson@raspberrypi.com>
Date: Wed, 17 Feb 2021 14:32:34 -0600
Subject: [PATCH] missing pico/malloc.h fixes #136

---
 src/rp2_common/pico_malloc/CMakeLists.txt | 2 ++
 src/rp2_common/pico_malloc/pico_malloc.c  | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/rp2_common/pico_malloc/CMakeLists.txt b/src/rp2_common/pico_malloc/CMakeLists.txt
index fddacc9..de7f858 100644
--- a/src/rp2_common/pico_malloc/CMakeLists.txt
+++ b/src/rp2_common/pico_malloc/CMakeLists.txt
@@ -6,6 +6,8 @@ if (NOT TARGET pico_malloc)
             ${CMAKE_CURRENT_LIST_DIR}/pico_malloc.c
             )
 
+    target_include_directories(pico_malloc INTERFACE ${CMAKE_CURRENT_LIST_DIR}/include)
+
     pico_wrap_function(pico_malloc malloc)
     pico_wrap_function(pico_malloc calloc)
     pico_wrap_function(pico_malloc free)
diff --git a/src/rp2_common/pico_malloc/pico_malloc.c b/src/rp2_common/pico_malloc/pico_malloc.c
index b632b16..2842a85 100644
--- a/src/rp2_common/pico_malloc/pico_malloc.c
+++ b/src/rp2_common/pico_malloc/pico_malloc.c
@@ -7,6 +7,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include "pico.h"
+#include "pico/malloc.h"
 
 #if PICO_USE_MALLOC_MUTEX
 #include "pico/mutex.h"
@@ -35,7 +36,7 @@ void *__wrap_malloc(size_t size) {
 #if PICO_USE_MALLOC_MUTEX
     mutex_exit(&malloc_mutex);
 #endif
-#ifdef PICO_DEBUG_MALLOC
+#if PICO_DEBUG_MALLOC
     if (!rc || ((uint8_t *)rc) + size > (uint8_t*)PICO_DEBUG_MALLOC_LOW_WATER) {
         printf("malloc %d %p->%p\n", (uint) size, rc, ((uint8_t *) rc) + size);
     }
@@ -52,7 +53,7 @@ void *__wrap_calloc(size_t count, size_t size) {
 #if PICO_USE_MALLOC_MUTEX
     mutex_exit(&malloc_mutex);
 #endif
-#ifdef PICO_DEBUG_MALLOC
+#if PICO_DEBUG_MALLOC
     if (!rc || ((uint8_t *)rc) + size > (uint8_t*)PICO_DEBUG_MALLOC_LOW_WATER) {
         printf("calloc %d %p->%p\n", (uint) (count * size), rc, ((uint8_t *) rc) + size);
     }