From 4dcfd19bbfa5e1009bd4e0fe95f41a47452493f9 Mon Sep 17 00:00:00 2001 From: David Lechner Date: Wed, 16 Nov 2022 17:31:21 -0600 Subject: [PATCH] extmod/extmod.cmake: Add MICROPY_PY_BTREE compiler definition. Instead of defining `MICROPY_PY_BTREE` in `mpconfigport.h` we can define it via CMake similar to how other ports that use Makefiles define it in `mpconfigport.mk`. Signed-off-by: David Lechner --- extmod/extmod.cmake | 1 + ports/esp32/mpconfigport.h | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/extmod/extmod.cmake b/extmod/extmod.cmake index 2207a951ad..ed7d16d1b5 100644 --- a/extmod/extmod.cmake +++ b/extmod/extmod.cmake @@ -93,6 +93,7 @@ if(MICROPY_PY_BTREE) ) list(APPEND MICROPY_DEF_CORE + MICROPY_PY_BTREE=1 __DBINTERFACE_PRIVATE=1 "virt_fd_t=void*" ) diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h index 957aa2e93b..d8822980b7 100644 --- a/ports/esp32/mpconfigport.h +++ b/ports/esp32/mpconfigport.h @@ -123,7 +123,6 @@ #define MICROPY_PY_USSL_FINALISER (1) #define MICROPY_PY_UWEBSOCKET (1) #define MICROPY_PY_WEBREPL (1) -#define MICROPY_PY_BTREE (1) #define MICROPY_PY_ONEWIRE (1) #define MICROPY_PY_UPLATFORM (1) #define MICROPY_PY_USOCKET_EVENTS (MICROPY_PY_WEBREPL)