diff --git a/src/arch_armgcc.h b/src/arch_armgcc.h index d9aff5e5..332bad6c 100644 --- a/src/arch_armgcc.h +++ b/src/arch_armgcc.h @@ -1,7 +1,9 @@ #pragma once #if MG_ARCH == MG_ARCH_ARMGCC +#ifndef _POSIX_TIMERS // Some newlib builds, e.g. Espressif's, define it #define _POSIX_TIMERS +#endif #include #if !defined(MG_ENABLE_LWIP) || !MG_ENABLE_LWIP diff --git a/src/arch_cube.h b/src/arch_cube.h index a49c6cb9..289e22ca 100644 --- a/src/arch_cube.h +++ b/src/arch_cube.h @@ -52,16 +52,18 @@ #define MG_TLS MG_TLS_BUILTIN #endif -#if !defined(MG_OTA) && defined(STM32F1) || defined(STM32F2) || \ - defined(STM32F4) || defined(STM32F7) +#ifndef MG_OTA // Pick OTA for the STM32 family, unless set by the user +#if defined(STM32F1) || defined(STM32F2) || defined(STM32F4) || \ + defined(STM32F7) #define MG_OTA MG_OTA_STM32F -#elif !defined(MG_OTA) && defined(STM32H5) +#elif defined(STM32H5) #define MG_OTA MG_OTA_STM32H5 -#elif !defined(MG_OTA) && defined(STM32H7) +#elif defined(STM32H7) #define MG_OTA MG_OTA_STM32H7 -#elif !defined(MG_OTA) && defined(STM32C5) +#elif defined(STM32C5) #define MG_OTA MG_OTA_STM32C5 #endif +#endif // use HAL-defined execute-in-ram section #ifndef MG_IRAM